@gingkoo/pandora-metabase 1.0.54 → 1.0.56

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

@@ -15,6 +15,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _locale = require("../../locale");
+var _types = require("../../store/types");
 var _pandora = require("@gingkoo/pandora");
 var _index = _interopRequireDefault(require("../../index"));
 var _helper = require("../../utils/helper");
@@ -89,6 +90,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];
@@ -101,7 +103,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: _types.ChangeType.datasource
+              });
               // store.setMeta([newMetaList], groupIndex);
             });
           }
@@ -125,7 +130,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: _types.ChangeType.columns
+          });
         }
       })
     });
@@ -157,7 +165,10 @@ var TableData = function TableData(props) {
                 newMetaList = store.metaList[groupIndex].list.slice(); // @ts-ignore
                 newMetaList[0].table.alias = alias;
                 newMetaList = (0, _utils.changeTableAlias)(newMetaList, newMetaList[0].table);
-                store.setMeta(newMetaList, groupIndex);
+                store.setMeta(newMetaList, groupIndex, {
+                  obj: newMetaList[0].table,
+                  type: _types.ChangeType.tableAlias
+                });
               case 2:
               case "end":
                 return _context2.stop();
@@ -221,13 +232,18 @@ var TableData = function TableData(props) {
                 var existingCol = newMetaList.columns.find(function (oldCol) {
                   return oldCol.name === newCol.name;
                 });
+                var _column = existingCol ? existingCol : newCol;
+                _column.select = store.isSelectFields || _column.select;
                 // 如果存在，返回旧列；否则返回新列
-                return existingCol ? existingCol : newCol;
+                return _column;
               });
               // (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: _types.ChangeType.subQuery
+              });
               o.close();
             } catch (e) {
               console.warn(e);
@@ -290,61 +306,113 @@ var TableData = function TableData(props) {
             onClick: function onClick() {
               showSubQuery(meta.subquery);
             },
-            children: [subQuerySelected && (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
-              title: (0, _locale.__)(tableIsError() ? isDel ? 'metabase.verify' : 'SqlQueryBuilder.repeatAlias' : 'SqlQueryBuilder.alias'),
-              children: (0, _jsxRuntime.jsx)(_pandora.Button, {
-                danger: tableIsError(),
-                className: (0, _classnames["default"])(':Sqb-TableName-as', {
-                  isError: tableIsError()
-                }),
-                shape: 'circle',
-                style: isDel ? {
-                  fontSize: 18,
-                  backgroundColor: '#fff',
-                  width: 'auto',
-                  height: 'auto'
-                } : {},
-                iconOnly: true,
-                primary: !isDel,
-                icon: isDel ? (0, _jsxRuntime.jsx)(_pandoraIcons.ExclamationCircleFill, {}) : 'As',
-                size: 'small',
-                onClick: function onClick(e) {
-                  var _meta$table4;
-                  e.stopPropagation();
-                  onChangeTableAlias(((_meta$table4 = meta.table) === null || _meta$table4 === void 0 ? void 0 : _meta$table4.alias) || '');
-                }
-              })
-            }), 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) : '', " ") : (0, _locale.__)('SqlQueryBuilder.setSubQuery')]
+            children: [subQuerySelected && (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+              children: function () {
+                var showButton = store.tableEnableAlias || tableIsError() && isDel;
+                var icon = isDel ? (0, _jsxRuntime.jsx)(_pandoraIcons.ExclamationCircleFill, {}) : store.tableEnableAlias ? 'As' : '';
+                return showButton ? (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
+                  title: (0, _locale.__)(tableIsError() ? isDel ? 'metabase.verify' : 'SqlQueryBuilder.repeatAlias' : 'SqlQueryBuilder.alias'),
+                  children: (0, _jsxRuntime.jsx)(_pandora.Button, {
+                    danger: tableIsError(),
+                    className: (0, _classnames["default"])(':Sqb-TableName-as', {
+                      isError: tableIsError()
+                    }),
+                    shape: 'circle',
+                    style: isDel ? {
+                      fontSize: 18,
+                      backgroundColor: '#fff',
+                      width: 'auto',
+                      height: 'auto'
+                    } : {},
+                    iconOnly: true,
+                    primary: !isDel,
+                    icon: icon,
+                    size: 'small',
+                    onClick: function onClick(e) {
+                      if (store.tableEnableAlias) {
+                        var _meta$table4;
+                        e.stopPropagation();
+                        onChangeTableAlias(((_meta$table4 = meta.table) === null || _meta$table4 === void 0 ? void 0 : _meta$table4.alias) || '');
+                      }
+                    }
+                  })
+                }) : 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 && store.tableEnableAlias ? "as ".concat((_meta$table6 = meta.table) === null || _meta$table6 === void 0 ? void 0 : _meta$table6.alias) : '', " ") : (0, _locale.__)('SqlQueryBuilder.setSubQuery')]
           }) : (0, _jsxRuntime.jsxs)("div", {
             className: (0, _classnames["default"])("Sqb-TableName", {
               notSelected: !selected
             }),
             onClick: selectTable,
-            children: [selected && (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
-              title: (0, _locale.__)(tableIsError() ? isDel ? 'metabase.verify' : 'SqlQueryBuilder.repeatAlias' : 'SqlQueryBuilder.alias'),
-              children: (0, _jsxRuntime.jsx)(_pandora.Button, {
-                danger: tableIsError(),
-                className: (0, _classnames["default"])(':Sqb-TableName-as', {
-                  isError: tableIsError()
-                }),
-                shape: 'circle',
-                style: isDel ? {
-                  fontSize: 18,
-                  backgroundColor: '#fff',
-                  width: 'auto',
-                  height: 'auto'
-                } : {},
-                iconOnly: true,
-                primary: !isDel,
-                icon: isDel ? (0, _jsxRuntime.jsx)(_pandoraIcons.ExclamationCircleFill, {}) : 'As',
-                size: 'small',
-                onClick: function onClick(e) {
-                  var _meta$table7;
-                  e.stopPropagation();
-                  onChangeTableAlias(((_meta$table7 = meta.table) === null || _meta$table7 === void 0 ? void 0 : _meta$table7.alias) || '');
-                }
-              })
-            }), 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) : '') : (0, _locale.__)('SqlQueryBuilder.pickTable')]
+            children: [selected && (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+              children: function () {
+                var showButton = store.tableEnableAlias || tableIsError() && isDel;
+                var icon = isDel ? (0, _jsxRuntime.jsx)(_pandoraIcons.ExclamationCircleFill, {}) : store.tableEnableAlias ? 'As' : '';
+                return showButton ? (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
+                  title: (0, _locale.__)(tableIsError() ? isDel ? 'metabase.verify' : 'SqlQueryBuilder.repeatAlias' : 'SqlQueryBuilder.alias'),
+                  children: (0, _jsxRuntime.jsx)(_pandora.Button, {
+                    danger: tableIsError(),
+                    className: (0, _classnames["default"])(':Sqb-TableName-as', {
+                      isError: tableIsError()
+                    }),
+                    shape: 'circle',
+                    style: isDel ? {
+                      fontSize: 18,
+                      backgroundColor: '#fff',
+                      width: 'auto',
+                      height: 'auto'
+                    } : {},
+                    iconOnly: true,
+                    primary: !isDel,
+                    icon: icon,
+                    size: 'small',
+                    onClick: function onClick(e) {
+                      if (store.tableEnableAlias) {
+                        var _meta$table7;
+                        e.stopPropagation();
+                        onChangeTableAlias(((_meta$table7 = meta.table) === null || _meta$table7 === void 0 ? void 0 : _meta$table7.alias) || '');
+                      }
+                    }
+                  })
+                }) : null;
+              }()
+            })
+            // <Tooltip
+            //   title={__(
+            //     tableIsError()
+            //       ? isDel
+            //         ? 'metabase.verify'
+            //         : 'SqlQueryBuilder.repeatAlias'
+            //       : 'SqlQueryBuilder.alias',
+            //   )}
+            // >
+            //   <Button
+            //     danger={tableIsError()}
+            //     className={cx(':Sqb-TableName-as', {
+            //       isError: tableIsError(),
+            //     })}
+            //     shape='circle'
+            //     style={
+            //       isDel
+            //         ? {
+            //             fontSize: 18,
+            //             backgroundColor: '#fff',
+            //             width: 'auto',
+            //             height: 'auto',
+            //           }
+            //         : {}
+            //     }
+            //     iconOnly
+            //     primary={!isDel}
+            //     icon={isDel ? <ExclamationCircleFill /> : 'As'}
+            //     size='small'
+            //     onClick={(e) => {
+            //       e.stopPropagation();
+            //       onChangeTableAlias(meta.table?.alias || '');
+            //     }}
+            //   ></Button>
+            // </Tooltip>
+            , 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) : '') : (0, _locale.__)('SqlQueryBuilder.pickTable')]
           }), store.showSubquery && (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
             title: (0, _locale.__)('SqlQueryBuilder.switchSubQuery'),
             children: (0, _jsxRuntime.jsx)(_pandora.Button, {

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

@@ -15,6 +15,7 @@ var _react = require("react");
 var _helper = require("../utils/helper");
 var _enum = require("../store/enum");
 var _utils = require("../utils");
+var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 var _excluded = ["alias", "datasourceName", "datasourceId", "column"];
 var metaKey = 1;
 var SummarizeAlias = exports.SummarizeAlias = 'source';
@@ -133,6 +134,18 @@ var useStore = function useStore() {
     _useState38 = (0, _slicedToArray2["default"])(_useState37, 2),
     isExit = _useState38[0],
     setIsExit = _useState38[1]; // 是否是notExit
+  var _useState39 = (0, _react.useState)(true),
+    _useState40 = (0, _slicedToArray2["default"])(_useState39, 2),
+    tableEnableAlias = _useState40[0],
+    setTableEnableAlias = _useState40[1]; // 表名是否开启别名
+  var _useState41 = (0, _react.useState)(true),
+    _useState42 = (0, _slicedToArray2["default"])(_useState41, 2),
+    fieldEnableAlias = _useState42[0],
+    setFieldEnableAlias = _useState42[1]; // 字段名是否开启别名
+  var _useState43 = (0, _react.useState)(true),
+    _useState44 = (0, _slicedToArray2["default"])(_useState43, 2),
+    isSelectFields = _useState44[0],
+    setIsSelectFields = _useState44[1]; // 是否默认勾选字段
   // 外层ref
   var popupContainer = (0, _react.useRef)();
   // const [fetchDatasetFn, setFetchDatasetFn] = useState<(id: string) => Promise<any>>(
@@ -143,6 +156,10 @@ var useStore = function useStore() {
     fetchDatasetFn.current = fn;
   };
   var fetchColumnsFn = (0, _react.useRef)();
+  var fetchChangeFn = (0, _react.useRef)();
+  var setFetchChangeFn = function setFetchChangeFn(fn) {
+    fetchChangeFn.current = fn;
+  };
   var setFetchColumnsFn = function setFetchColumnsFn(fn) {
     fetchColumnsFn.current = fn;
   };
@@ -226,6 +243,7 @@ var useStore = function useStore() {
       var _columns2;
       var oldColumns,
         callback,
+        isSelect,
         oldObj,
         selectId,
         _table$alias,
@@ -243,6 +261,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) {
@@ -271,7 +290,7 @@ var useStore = function useStore() {
               var obj = {};
               obj = oldObj[v.id] || {};
               return (0, _objectSpread2["default"])((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, obj), v), {}, {
-                select: select,
+                select: isSelect || select,
                 fieldUuid: obj.fieldUuid || v.fieldUuid || (0, _helper.uuidv4)('field')
               });
             });
@@ -286,14 +305,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 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(curData, groupInd) {
+      var changeObj,
+        _metaList,
+        newMeta,
+        isChange,
+        _args3 = arguments;
+      return _regenerator["default"].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 = (0, _cloneDeep["default"])(_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((0, _utils.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 || '';
@@ -318,8 +370,8 @@ var useStore = function useStore() {
               } else {
                 newMeta[i].columns = columns || [];
               }
-              setMeta(newMeta, groupIndex, data);
-            });
+              setMeta(newMeta, groupIndex, 'init', data);
+            }, false);
             return (0, _objectSpread2["default"])({}, v);
           }
           // 设置column
@@ -337,8 +389,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 (0, _objectSpread2["default"])({}, v);
           }
           return (0, _objectSpread2["default"])({}, v);
@@ -580,6 +632,8 @@ var useStore = function useStore() {
     fetchDatasetFn: fetchDatasetFn.current,
     setFetchDatasetFn: setFetchDatasetFn,
     fetchColumnsFn: fetchColumnsFn.current,
+    setFetchChangeFn: setFetchChangeFn,
+    fetchChangeFn: fetchChangeFn.current,
     setFetchColumnsFn: setFetchColumnsFn,
     showMainColumn: showMainColumn,
     showToolbar: showToolbar,
@@ -609,7 +663,13 @@ var useStore = function useStore() {
     formulaTemplates: formulaTemplates,
     setFormulaTemplates: setFormulaTemplates,
     isExit: isExit,
-    setIsExit: setIsExit
+    setIsExit: setIsExit,
+    tableEnableAlias: tableEnableAlias,
+    setTableEnableAlias: setTableEnableAlias,
+    fieldEnableAlias: fieldEnableAlias,
+    setFieldEnableAlias: setFieldEnableAlias,
+    isSelectFields: isSelectFields,
+    setIsSelectFields: setIsSelectFields
   };
 };
 var _default = exports["default"] = useStore;

package/lib/cjs/index.js

@@ -33,6 +33,7 @@ var SqlVisionBuilder = _react["default"].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,
@@ -43,6 +44,8 @@ var SqlVisionBuilder = _react["default"].forwardRef(function (props, ref) {
     value = _props$value === void 0 ? [] : _props$value,
     _props$sourceList = props.sourceList,
     sourceList = _props$sourceList === void 0 ? [] : _props$sourceList,
+    _props$exitSourceList = props.exitSourceList,
+    exitSourceList = _props$exitSourceList === void 0 ? [] : _props$exitSourceList,
     _props$showSubquery = props.showSubquery,
     showSubquery = _props$showSubquery === void 0 ? true : _props$showSubquery,
     _props$subShowSubquer = props.subShowSubquery,
@@ -54,11 +57,18 @@ var SqlVisionBuilder = _react["default"].forwardRef(function (props, ref) {
     _props$filterCustomTy = props.filterCustomType,
     filterCustomType = _props$filterCustomTy === void 0 ? false : _props$filterCustomTy,
     _props$isExit = props.isExit,
-    isExit = _props$isExit === void 0 ? false : _props$isExit;
+    isExit = _props$isExit === void 0 ? false : _props$isExit,
+    _props$tableEnableAli = props.tableEnableAlias,
+    tableEnableAlias = _props$tableEnableAli === void 0 ? true : _props$tableEnableAli,
+    _props$fieldEnableAli = props.fieldEnableAlias,
+    fieldEnableAlias = _props$fieldEnableAli === void 0 ? true : _props$fieldEnableAli,
+    _props$isSelectFields = props.isSelectFields,
+    isSelectFields = _props$isSelectFields === void 0 ? true : _props$isSelectFields;
   var store = (0, _useState["default"])();
   (0, _react.useEffect)(function () {
     getTables && store.setFetchDatasetFn(getTables);
     getColumns && store.setFetchColumnsFn(getColumns);
+    onChange && store.setFetchChangeFn(onChange);
   }, []);
   (0, _react.useEffect)(function () {
     store.setProps(props);
@@ -68,8 +78,8 @@ var SqlVisionBuilder = _react["default"].forwardRef(function (props, ref) {
     store.setPreData(_value);
   }, [value]);
   (0, _react.useEffect)(function () {
-    store.setSourceList(sourceList);
-  }, [sourceList]);
+    store.setSourceList(isExit && exitSourceList && Array.from(exitSourceList).length > 0 ? exitSourceList || sourceList : sourceList);
+  }, [sourceList, exitSourceList, isExit]);
   (0, _react.useEffect)(function () {
     store.setShowFields(showFields);
     store.setFieldNameTpl(fieldNameTpl || '${name}');
@@ -82,7 +92,10 @@ var SqlVisionBuilder = _react["default"].forwardRef(function (props, ref) {
     store.setIgnoreGroupByType(ignoreGroupByType);
     store.setfilterCustomType(filterCustomType);
     store.setIsExit(isExit);
-  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType, isExit]);
+    store.setTableEnableAlias(tableEnableAlias);
+    store.setFieldEnableAlias(fieldEnableAlias);
+    store.setIsSelectFields(isSelectFields);
+  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType, isExit, tableEnableAlias, fieldEnableAlias, isSelectFields]);
   _react["default"].useImperativeHandle(ref, function () {
     return {
       // setDatasource: (list) => {

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

@@ -3,7 +3,27 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.MetaSummarize_Enum = exports.AtomsTypeEnum = void 0;
+exports.MetaSummarize_Enum = exports.ChangeType = exports.AtomsTypeEnum = void 0;
+// 修改类型
+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 || (exports.ChangeType = ChangeType = {}));
 // 表达式类型
 var AtomsTypeEnum;
 (function (AtomsTypeEnum) {

package/lib/cjs/types.d.ts

@@ -25,6 +25,7 @@ export interface MetabaseProps {
     onOk?: (params: any) => void;
     value?: MetaListType[];
     sourceList?: DatasourceType[];
+    exitSourceList?: DatasourceType[];
     showSubquery?: boolean;
     subShowSubquery?: boolean;
     constantList?: OptionItem[];
@@ -34,6 +35,10 @@ export interface MetabaseProps {
     notExistsColumns?: DataType[];
     formulaTemplates?: FormulaTemplatesItem[];
     isExit?: boolean;
+    tableEnableAlias?: boolean;
+    fieldEnableAlias?: boolean;
+    isSelectFields?: boolean;
+    onChange?: (newData: MetaListType[], curData: any) => Promise<void | Boolean>;
 }
 export interface OptionItem {
     value?: string;

package/lib/es/components/dialog/select-column/index.js

@@ -14,6 +14,7 @@ import { useEffect, useMemo, useState } from 'react';
 import cloneDeep from 'lodash/cloneDeep';
 import cx from 'classnames';
 import { Button, Modal, Input, Tooltip, Toast } from '@gingkoo/pandora';
+import { ChangeType } from '../../../store/types';
 import { __ } from '../../../locale';
 import { NotSelectIcon, SelectIcon } from '../../icons';
 import { useStore } from '../../../hooks/use-provider';
@@ -116,7 +117,10 @@ var SelectColumn = function SelectColumn(_ref) {
                 newColumns[i].fieldAlias = fieldAlias;
                 newColumns[i].fieldUuid = newColumns[i].fieldUuid || uuidv4('field');
                 newMetaList = changeFieldAlias(newMetaList, newColumns[i]);
-                store.setMeta(newMetaList, groupIndex);
+                store.setMeta(newMetaList, groupIndex, {
+                  obj: newColumns[i],
+                  type: ChangeType.fieldAlias
+                });
                 onSelect(newColumns);
                 setTimeout(function () {
                   store.setClosable(true);
@@ -185,7 +189,7 @@ var SelectColumn = function SelectColumn(_ref) {
               children: _jsx(SelectIcon, {})
             }) : _jsx("div", {
               className: 'no-select mr-2'
-            }), v.name, v.name_zh ? " \uFF08".concat(v.name_zh, "\uFF09") : '', v.fieldAlias ? " as ".concat(v.fieldAlias) : '', _jsx(Tooltip, {
+            }), v.name, v.name_zh ? " \uFF08".concat(v.name_zh, "\uFF09") : '', v.fieldAlias ? " as ".concat(v.fieldAlias) : '', store.fieldEnableAlias && _jsx(Tooltip, {
               title: __('SqlQueryBuilder.alias'),
               children: _jsx(Button, {
                 className: ':Sqb-TableName-as',

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 || [])));