@gingkoo/pandora-metabase 1.0.92 → 1.0.94

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

@@ -185,10 +185,14 @@ var useStore = function useStore() {
     _useState66 = _slicedToArray(_useState65, 2),
     isMetabaseCopy = _useState66[0],
     setIsMetabaseCopy = _useState66[1]; // 是否开启勾选组复制
-  var _useState67 = useState(storage._metabaseCopyModule || []),
+  var _useState67 = useState([]),
     _useState68 = _slicedToArray(_useState67, 2),
-    metabaseCopyModule = _useState68[0],
-    setMetabaseCopyModule = _useState68[1]; // 复制的内容
+    existsError = _useState68[0],
+    setExistsError = _useState68[1]; // exists 的错误字段
+  var _useState69 = useState(storage._metabaseCopyModule || []),
+    _useState70 = _slicedToArray(_useState69, 2),
+    metabaseCopyModule = _useState70[0],
+    setMetabaseCopyModule = _useState70[1]; // 复制的内容
   var setFormulaTemplates = function setFormulaTemplates(data) {
     var newData = data === null || data === void 0 ? void 0 : data.map(function (v) {
       var children = v.children.map(function (vv) {
@@ -214,40 +218,62 @@ var useStore = function useStore() {
   var fetchColumnsFn = useRef();
   var fetchChangeFn = useRef();
   var fetchDiffFn = useRef();
+  var fetchExistsError = useRef();
   var setFetchChangeFn = function setFetchChangeFn(fn) {
     fetchChangeFn.current = fn;
   };
   var setFetchDiffFn = function setFetchDiffFn(fn) {
     fetchDiffFn.current = fn;
   };
+  var setExistsErrorFn = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(fn) {
+      var data;
+      return _regeneratorRuntime.wrap(function (_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 1;
+            return fn();
+          case 1:
+            data = _context.sent;
+            setExistsError(data || []);
+          case 2:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function setExistsErrorFn(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
   // 获取所有数据表
   var getModuleDiffCode = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
       var oldCode,
         newCode,
         data,
-        _args = arguments;
-      return _regeneratorRuntime.wrap(function (_context) {
-        while (1) switch (_context.prev = _context.next) {
+        _args2 = arguments;
+      return _regeneratorRuntime.wrap(function (_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            oldCode = _args.length > 0 && _args[0] !== undefined ? _args[0] : [];
-            newCode = _args.length > 1 ? _args[1] : undefined;
-            _context.next = 1;
+            oldCode = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : [];
+            newCode = _args2.length > 1 ? _args2[1] : undefined;
+            _context2.next = 1;
             return fetchDiffFn.current({
               oldCode: oldCode,
               newCode: newCode
             });
           case 1:
-            data = _context.sent;
-            return _context.abrupt("return", data);
+            data = _context2.sent;
+            return _context2.abrupt("return", data);
           case 2:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee);
+      }, _callee2);
     }));
     return function getModuleDiffCode() {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
   var setFetchColumnsFn = function setFetchColumnsFn(fn) {
@@ -288,46 +314,46 @@ var useStore = function useStore() {
   }, [sourceList, isExit, tableFlat]);
   // 获取所有数据表
   var getSourceTable = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(source) {
+    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4(source) {
       var results;
-      return _regeneratorRuntime.wrap(function (_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+      return _regeneratorRuntime.wrap(function (_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            _context3.next = 1;
+            _context4.next = 1;
             return Promise.all(source.map(/*#__PURE__*/function () {
-              var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(v) {
+              var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(v) {
                 var tables;
-                return _regeneratorRuntime.wrap(function (_context2) {
-                  while (1) switch (_context2.prev = _context2.next) {
+                return _regeneratorRuntime.wrap(function (_context3) {
+                  while (1) switch (_context3.prev = _context3.next) {
                     case 0:
-                      _context2.next = 1;
+                      _context3.next = 1;
                       return fetchDataset(v.datasourceId);
                     case 1:
-                      tables = _context2.sent;
-                      return _context2.abrupt("return", _objectSpread(_objectSpread({}, v), {}, {
+                      tables = _context3.sent;
+                      return _context3.abrupt("return", _objectSpread(_objectSpread({}, v), {}, {
                         children: tables
                       }));
                     case 2:
                     case "end":
-                      return _context2.stop();
+                      return _context3.stop();
                   }
-                }, _callee2);
+                }, _callee3);
               }));
-              return function (_x2) {
-                return _ref3.apply(this, arguments);
+              return function (_x3) {
+                return _ref4.apply(this, arguments);
               };
             }()));
           case 1:
-            results = _context3.sent;
+            results = _context4.sent;
             setSourceTable(results || []);
           case 2:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
-      }, _callee3);
+      }, _callee4);
     }));
-    return function getSourceTable(_x) {
-      return _ref2.apply(this, arguments);
+    return function getSourceTable(_x2) {
+      return _ref3.apply(this, arguments);
     };
   }();
   // const showMainColumn = useMemo(() => {
@@ -346,41 +372,41 @@ var useStore = function useStore() {
     return !!~toolbar.indexOf(name);
   };
   var fetchDataset = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4(datasourceId) {
+    var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee5(datasourceId) {
       var tables, _tables;
-      return _regeneratorRuntime.wrap(function (_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+      return _regeneratorRuntime.wrap(function (_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
             tables = getDataset(datasourceId);
             if (!tables.length) {
-              _context4.next = 1;
+              _context5.next = 1;
               break;
             }
-            return _context4.abrupt("return", tables);
+            return _context5.abrupt("return", tables);
           case 1:
-            _context4.next = 2;
+            _context5.next = 2;
             return fetchDatasetFn.current(datasourceId, {
               isExit: isExit
             });
           case 2:
-            _tables = _context4.sent;
+            _tables = _context5.sent;
             setDataset(datasourceId, _tables);
-            return _context4.abrupt("return", _tables);
+            return _context5.abrupt("return", _tables);
           case 3:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
-      }, _callee4);
+      }, _callee5);
     }));
-    return function fetchDataset(_x3) {
-      return _ref4.apply(this, arguments);
+    return function fetchDataset(_x4) {
+      return _ref5.apply(this, arguments);
     };
   }();
   // 根据数据源id查询集合列表
   //  fetchDataset():
   // 查询表字段
   var fetchColumns = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee5(table, datasourceId) {
+    var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee6(table, datasourceId) {
       var _columns2;
       var oldColumns,
         callback,
@@ -398,15 +424,15 @@ var useStore = function useStore() {
         tableName,
         columns,
         _columns,
-        _args5 = arguments;
-      return _regeneratorRuntime.wrap(function (_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
+        _args6 = arguments;
+      return _regeneratorRuntime.wrap(function (_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
           case 0:
-            oldColumns = _args5.length > 2 && _args5[2] !== undefined ? _args5[2] : [];
-            callback = _args5.length > 3 ? _args5[3] : undefined;
-            isSelect = _args5.length > 4 && _args5[4] !== undefined ? _args5[4] : isSelectFields;
-            _isSubquery = _args5.length > 5 && _args5[5] !== undefined ? _args5[5] : isSubquery;
-            _isExit = _args5.length > 6 && _args5[6] !== undefined ? _args5[6] : isExit;
+            oldColumns = _args6.length > 2 && _args6[2] !== undefined ? _args6[2] : [];
+            callback = _args6.length > 3 ? _args6[3] : undefined;
+            isSelect = _args6.length > 4 && _args6[4] !== undefined ? _args6[4] : isSelectFields;
+            _isSubquery = _args6.length > 5 && _args6[5] !== undefined ? _args6[5] : isSubquery;
+            _isExit = _args6.length > 6 && _args6[6] !== undefined ? _args6[6] : isExit;
             // 获取之前选中的数据
             oldObj = {};
             selectId = oldColumns.filter(function (v) {
@@ -425,15 +451,15 @@ var useStore = function useStore() {
             tableName = table.name;
             columns = getColumns(tableName);
             if (columns.length) {
-              _context5.next = 2;
+              _context6.next = 2;
               break;
             }
-            _context5.next = 1;
+            _context6.next = 1;
             return fetchColumnsFn.current(extra, datasourceId, {
               isExit: _isExit
             });
           case 1:
-            columns = _context5.sent;
+            columns = _context6.sent;
             setColumns(tableName, columns);
           case 2:
             _columns = (_columns2 = columns) === null || _columns2 === void 0 ? void 0 : _columns2.map(function (v) {
@@ -448,26 +474,26 @@ var useStore = function useStore() {
             typeof callback === 'function' && callback(_columns);
           case 3:
           case "end":
-            return _context5.stop();
+            return _context6.stop();
         }
-      }, _callee5);
+      }, _callee6);
     }));
-    return function fetchColumns(_x4, _x5) {
-      return _ref5.apply(this, arguments);
+    return function fetchColumns(_x5, _x6) {
+      return _ref6.apply(this, arguments);
     };
   }();
   var setMeta = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee6(curData, groupInd) {
+    var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee7(curData, groupInd) {
       var changeObj,
         _metaList,
         newMeta,
         isChange,
-        _args6 = arguments;
-      return _regeneratorRuntime.wrap(function (_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+        _args7 = arguments;
+      return _regeneratorRuntime.wrap(function (_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
           case 0:
-            changeObj = _args6.length > 2 && _args6[2] !== undefined ? _args6[2] : {};
-            _metaList = _args6.length > 3 && _args6[3] !== undefined ? _args6[3] : metaList;
+            changeObj = _args7.length > 2 && _args7[2] !== undefined ? _args7[2] : {};
+            _metaList = _args7.length > 3 && _args7[3] !== undefined ? _args7[3] : metaList;
             newMeta = cloneDeep(_metaList);
             if (newMeta[groupInd]) {
               newMeta[groupInd].list = curData;
@@ -475,29 +501,29 @@ var useStore = function useStore() {
             }
             // 过滤掉初始化
             if (!(changeObj === 'init')) {
-              _context6.next = 1;
+              _context7.next = 1;
               break;
             }
-            return _context6.abrupt("return");
+            return _context7.abrupt("return");
           case 1:
-            _context6.next = 2;
+            _context7.next = 2;
             return fetchChangeFn.current(splitByUnion(_metaList), changeObj, {
               isExit: isExit
             });
           case 2:
-            isChange = _context6.sent;
+            isChange = _context7.sent;
             // 是否还原
             if (isChange === false) {
               _setMeta(_metaList);
             }
           case 3:
           case "end":
-            return _context6.stop();
+            return _context7.stop();
         }
-      }, _callee6);
+      }, _callee7);
     }));
-    return function setMeta(_x6, _x7) {
-      return _ref6.apply(this, arguments);
+    return function setMeta(_x7, _x8) {
+      return _ref7.apply(this, arguments);
     };
   }();
   // 回显
@@ -872,7 +898,9 @@ var useStore = function useStore() {
     isMetabaseCopy: isMetabaseCopy,
     setIsMetabaseCopy: setIsMetabaseCopy,
     operatorList: operatorList,
-    setOperatorList: setOperatorList
+    setOperatorList: setOperatorList,
+    setExistsErrorFn: setExistsErrorFn,
+    existsError: existsError
   };
 };
 export default useStore;

package/lib/es/index.d.ts

@@ -3,12 +3,6 @@ import './locale/en';
 import './locale/zh';
 import type { MetabaseProps, SqlVisionBuilderRef, DatasourceType } from './types';
 import type { MetaListType, ToolbarType } from './store/types';
-/**
- * 规则
- * 1、主表一换 下面全部删除
- * 2、关联如果动了表或者删除了 下面的关联都删除
- * 3、关联如果动了表或者删除了 下面对应排序用到的对应的字段也删除 todo. 未完成 因为有可能关联里面选一样的表 还不知道怎么搞
- */
 declare const SqlVisionBuilder: React.ForwardRefExoticComponent<MetabaseProps & React.RefAttributes<SqlVisionBuilderRef>>;
 export default SqlVisionBuilder;
 export { MetabaseProps, DatasourceType, MetaListType, ToolbarType, SqlVisionBuilderRef };

package/lib/es/index.js

@@ -17,6 +17,7 @@ import cloneDeep from 'lodash/cloneDeep';
  * 2、关联如果动了表或者删除了 下面的关联都删除
  * 3、关联如果动了表或者删除了 下面对应排序用到的对应的字段也删除 todo. 未完成 因为有可能关联里面选一样的表 还不知道怎么搞
  */
+var EMPTY_ARRAY = [];
 var SqlVisionBuilder = React.forwardRef(function (props, ref) {
   var _props$loading = props.loading,
     loading = _props$loading === void 0 ? false : _props$loading,
@@ -26,6 +27,7 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     getColumns = props.getColumns,
     onChange = props.onChange,
     getModuleDiffCode = props.getModuleDiffCode,
+    getExistsError = props.getExistsError,
     _props$tableNameTpl = props.tableNameTpl,
     tableNameTpl = _props$tableNameTpl === void 0 ? '${name}' : _props$tableNameTpl,
     _props$fieldNameTpl = props.fieldNameTpl,
@@ -33,11 +35,11 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     _props$toolbar = props.toolbar,
     toolbar = _props$toolbar === void 0 ? ['filter', 'summarize', 'joinData', 'customColumn', 'sort', 'rowLimit'] : _props$toolbar,
     _props$value = props.value,
-    value = _props$value === void 0 ? [] : _props$value,
+    value = _props$value === void 0 ? EMPTY_ARRAY : _props$value,
     _props$sourceList = props.sourceList,
-    sourceList = _props$sourceList === void 0 ? [] : _props$sourceList,
+    sourceList = _props$sourceList === void 0 ? EMPTY_ARRAY : _props$sourceList,
     _props$exitSourceList = props.exitSourceList,
-    exitSourceList = _props$exitSourceList === void 0 ? [] : _props$exitSourceList,
+    exitSourceList = _props$exitSourceList === void 0 ? EMPTY_ARRAY : _props$exitSourceList,
     _props$showSubquery = props.showSubquery,
     showSubquery = _props$showSubquery === void 0 ? true : _props$showSubquery,
     _props$subShowSubquer = props.subShowSubquery,
@@ -70,13 +72,14 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     _props$moduleCopy = props.moduleCopy,
     moduleCopy = _props$moduleCopy === void 0 ? false : _props$moduleCopy,
     _props$operatorList = props.operatorList,
-    operatorList = _props$operatorList === void 0 ? [] : _props$operatorList;
+    operatorList = _props$operatorList === void 0 ? EMPTY_ARRAY : _props$operatorList;
   var store = useData();
   useEffect(function () {
     getTables && store.setFetchDatasetFn(getTables);
     getColumns && store.setFetchColumnsFn(getColumns);
     onChange && store.setFetchChangeFn(onChange);
     getModuleDiffCode && store.setFetchDiffFn(getModuleDiffCode);
+    getExistsError && store.setExistsErrorFn(getExistsError);
   }, []);
   useEffect(function () {
     store.setProps(props);
@@ -112,7 +115,7 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     store.setModuleDiff(moduleDiff);
     store.setIsSubquery(isSubquery);
     store.setModuleCopy(moduleCopy);
-    store.setOperatorList(operatorList);
+    store.setOperatorList(operatorList || []);
   }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType, isExit, tableEnableAlias, fieldEnableAlias, groupByEnableAlias, isSelectFields, tableFlat, copyType, metabaseCopy, moduleDiff, isSubquery, moduleCopy, operatorList]);
   React.useImperativeHandle(ref, function () {
     return {

package/lib/es/types.d.ts

@@ -59,6 +59,7 @@ export interface MetabaseProps {
         oldCode: string;
         newCode: string;
     }>;
+    getExistsError?: () => Promise<any[]>;
     operatorList?: any[];
 }
 export interface OptionItem {

package/lib/es/utils.d.ts

@@ -30,6 +30,14 @@ 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 declare const isError: (item: AtomsItem | AtomsItem[], data: DataType[]) => boolean;
+/**
+ * 在嵌套结构 root 中查找是否存在一个对象，使得 target 是该对象的子集
+ * @param root 可能包含任意层数组/对象的根数据
+ * @param target 目标对象（可能只包含部分字段）
+ * @returns 是否存在
+ */
+export declare function containsSubset(root: unknown, target: Record<string, unknown>): boolean;
+export declare const isExistsError: (meta: any[], errorList: any[]) => boolean;
 export declare const changeCopyField: (items: AtomsItem[], data: any[]) => AtomsItem[];
 export declare const changeExistsCopyField: (list: MetaListType[], data: any[]) => MetaListType[];
 export declare const metaIsCheck: (data: any[], item: any) => boolean;

package/lib/es/utils.js

@@ -1,3 +1,4 @@
+import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
@@ -723,7 +724,8 @@ var _isError = function isError(item, data) {
       tableId = _item$tableId === void 0 ? '' : _item$tableId,
       _item$tableAlias = item.tableAlias,
       tableAlias = _item$tableAlias === void 0 ? '' : _item$tableAlias,
-      fieldName = item.fieldName;
+      fieldName = item.fieldName,
+      fieldId = item.fieldId;
     var _datasourceId = datasourceId || 'source'; // 默认为source
     if (tableId === 'source') {
       _datasourceId = 'source';
@@ -739,13 +741,13 @@ var _isError = function isError(item, data) {
       } else {
         var _tables$_datasourceId2;
         return tables === null || tables === void 0 || (_tables$_datasourceId2 = tables[_datasourceId]) === null || _tables$_datasourceId2 === void 0 || (_tables$_datasourceId2 = _tables$_datasourceId2[tableId]) === null || _tables$_datasourceId2 === void 0 ? void 0 : _tables$_datasourceId2.every(function (field) {
-          return field.name !== fieldName;
+          return field.name !== fieldName || field.id !== fieldId;
         });
       }
     } else {
       var _tables$_datasourceId3;
       var hasField = (tables === null || tables === void 0 || (_tables$_datasourceId3 = tables[_datasourceId]) === null || _tables$_datasourceId3 === void 0 || (_tables$_datasourceId3 = _tables$_datasourceId3[tableId + tableAlias]) === null || _tables$_datasourceId3 === void 0 || (_tables$_datasourceId3 = _tables$_datasourceId3.filter(function (v) {
-        return v.name === fieldName;
+        return v.name === fieldName && v.id === fieldId;
       })) === null || _tables$_datasourceId3 === void 0 ? void 0 : _tables$_datasourceId3.length) > 0;
       return !hasField; // 注意：返回 true 表示“有错误”
     }
@@ -766,15 +768,102 @@ var _isError = function isError(item, data) {
   }
   return false; // 其他类型默认无错误
 };
-// 设置新字段信息
+/**
+ * 深度判断 sub 是否是 obj 的子集（递归比较所有可枚举自有属性）
+ * @param sub 可能包含部分属性的对象
+ * @param obj 待比较的对象
+ * @param visited 用于处理循环引用的 WeakSet
+ */
 export { _isError as isError };
+function isSubset(sub, obj) {
+  var visited = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : new WeakSet();
+  // 基本类型或引用相同
+  if (sub === obj) return true;
+  // 如果任一不是对象/数组，或者为 null，则不相等（sub 为基本类型时，上面已经比较过，这里只处理对象不等的情况）
+  if (_typeof(sub) !== 'object' || sub === null || _typeof(obj) !== 'object' || obj === null) {
+    return false;
+  }
+  // 避免循环引用
+  if (visited.has(sub) || visited.has(obj)) return false;
+  visited.add(sub);
+  visited.add(obj);
+  // 处理数组
+  if (Array.isArray(sub)) {
+    if (!Array.isArray(obj) || sub.length !== obj.length) return false;
+    for (var i = 0; i < sub.length; i++) {
+      if (!isSubset(sub[i], obj[i], visited)) return false;
+    }
+    return true;
+  }
+  // 普通对象：遍历 sub 的每个键
+  for (var key in sub) {
+    if (Object.prototype.hasOwnProperty.call(sub, key)) {
+      // obj 必须包含该键
+      if (!Object.prototype.hasOwnProperty.call(obj, key)) return false;
+      // 递归比较值
+      if (!isSubset(sub[key], obj[key], visited)) return false;
+    }
+  }
+  return true;
+}
+/**
+ * 在嵌套结构 root 中查找是否存在一个对象，使得 target 是该对象的子集
+ * @param root 可能包含任意层数组/对象的根数据
+ * @param target 目标对象（可能只包含部分字段）
+ * @returns 是否存在
+ */
+export function containsSubset(root, target) {
+  var visited = new WeakSet();
+  function search(current) {
+    if (current && _typeof(current) === 'object') {
+      // 避免循环引用
+      if (visited.has(current)) return false;
+      visited.add(current);
+      // 如果是普通对象（非数组），先检查是否包含 target 子集
+      if (!Array.isArray(current) && isSubset(target, current)) {
+        return true;
+      }
+      // 继续深入遍历子元素
+      if (Array.isArray(current)) {
+        var _iterator2 = _createForOfIteratorHelper(current),
+          _step2;
+        try {
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var item = _step2.value;
+            if (search(item)) return true;
+          }
+        } catch (err) {
+          _iterator2.e(err);
+        } finally {
+          _iterator2.f();
+        }
+      } else {
+        for (var key in current) {
+          if (Object.prototype.hasOwnProperty.call(current, key)) {
+            if (search(current[key])) return true;
+          }
+        }
+      }
+    }
+    return false;
+  }
+  return search(root);
+}
+// 判断当前meta中是否含有errorList
+export var isExistsError = function isExistsError(meta, errorList) {
+  var _meta = cloneDeep(meta);
+  return errorList.some(function (error) {
+    return containsSubset(_meta, error);
+  });
+};
+// 设置新字段信息
 function setNewField(field, data) {
   console.log('🚀 ~ setNewField ~ field:', field);
-  var _iterator2 = _createForOfIteratorHelper(data),
-    _step2;
+  var _iterator3 = _createForOfIteratorHelper(data),
+    _step3;
   try {
-    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-      var table = _step2.value;
+    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+      var table = _step3.value;
       // 第一步：判断表名是否一致
       if (table.name !== field.tableName) {
         continue;
@@ -802,9 +891,9 @@ function setNewField(field, data) {
       break;
     }
   } catch (err) {
-    _iterator2.e(err);
+    _iterator3.e(err);
   } finally {
-    _iterator2.f();
+    _iterator3.f();
   }
   console.log('🚀 ~ setNewField ~ field:', field);
   return field;

package/package.json

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