@gingkoo/pandora-metabase 1.0.93 → 1.0.95

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

@@ -4,11 +4,14 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isError = exports.isCanPaste = exports.getSubColumns = exports.getMetaTabels = exports.getHelper = exports.getColumnsTables = exports.findMetaKey = exports.findIndex = exports.changeTableAlias = exports.changeFieldAlias = exports.changeExistsCopyField = exports.changeCopyField = exports.buildSqlQuery = void 0;
+exports.changeTableAlias = exports.changeFieldAlias = exports.changeExistsCopyField = exports.changeCopyField = exports.buildSqlQuery = void 0;
+exports.containsSubset = containsSubset;
+exports.isExistsError = exports.isError = exports.isCanPaste = exports.getSubColumns = exports.getMetaTabels = exports.getHelper = exports.getColumnsTables = exports.findMetaKey = exports.findIndex = void 0;
 exports.isValidSQLAlias = isValidSQLAlias;
 exports.patchData = exports.metaIsCheck = void 0;
 exports.reassembleByUnion = reassembleByUnion;
 exports.splitByUnion = splitByUnion;
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/typeof"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createForOfIteratorHelper"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
@@ -778,14 +781,101 @@ var _isError = exports.isError = function isError(item, data) {
   }
   return false; // 其他类型默认无错误
 };
+/**
+ * 深度判断 sub 是否是 obj 的子集（递归比较所有可枚举自有属性）
+ * @param sub 可能包含部分属性的对象
+ * @param obj 待比较的对象
+ * @param visited 用于处理循环引用的 WeakSet
+ */
+function isSubset(sub, obj) {
+  var visited = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : new WeakSet();
+  // 基本类型或引用相同
+  if (sub === obj) return true;
+  // 如果任一不是对象/数组，或者为 null，则不相等（sub 为基本类型时，上面已经比较过，这里只处理对象不等的情况）
+  if ((0, _typeof2["default"])(sub) !== 'object' || sub === null || (0, _typeof2["default"])(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 是否存在
+ */
+function containsSubset(root, target) {
+  var visited = new WeakSet();
+  function search(current) {
+    if (current && (0, _typeof2["default"])(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 = (0, _createForOfIteratorHelper2["default"])(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
+var isExistsError = exports.isExistsError = function isExistsError(meta, errorList) {
+  var _meta = (0, _cloneDeep3["default"])(meta);
+  return errorList.some(function (error) {
+    return containsSubset(_meta, error);
+  });
+};
 // 设置新字段信息
 function setNewField(field, data) {
   console.log('🚀 ~ setNewField ~ field:', field);
-  var _iterator2 = (0, _createForOfIteratorHelper2["default"])(data),
-    _step2;
+  var _iterator3 = (0, _createForOfIteratorHelper2["default"])(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;
@@ -813,9 +903,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/lib/es/components/dialog/formula/index.js

@@ -9,8 +9,9 @@ import './index.less';
 import FormulaList from '../formula-list';
 import { AddIcon, CloseIcon } from '../../icons';
 import { isOk } from '../formula-list/utils';
+import ItemName from '../../modules/components/item-name';
 import { __ } from '../../../locale';
-import { getTemArgs, getObjTem, getParamActions, getQuotes } from './utils';
+import { getTemArgs, getObjTem, getParamActions, getQuotes, formulaName, formulaIsError } from './utils';
 import Styled from 'styled-components';
 // import { OptionsTypeEnum, customTypes, otherList, operatorList, functionList } from './enum';
 import { AtomsTypeEnum, FormulaTypeEnum } from '../../../store/types';
@@ -126,36 +127,39 @@ var CaseEditor = React.forwardRef(function (props, ref) {
               children: "\u8BF7\u5148\u9009\u62E9\u516C\u5F0F\uFF0C\u5207\u6362\u516C\u5F0F\u65F6\u4F1A\u91CD\u7F6E\u53C2\u6570"
             }), _jsx("div", {
               className: 'Sqb-NotebookCell formula-name',
-              children: _jsx(Select, {
-                triggerProps: {
-                  clickToClose: true
-                },
-                value: fun.id || fun.name,
-                triggerElement: function triggerElement(value) {
-                  var _formulaList$fun$id;
-                  return _jsx("div", {
-                    className: cx("Sqb-TableName Sqb-TableName-OPERATOR", {
-                      notSelected: !fun.name
-                    }),
-                    children: fun.id ? (_formulaList$fun$id = formulaList[fun.id]) === null || _formulaList$fun$id === void 0 ? void 0 : _formulaList$fun$id.name : __('customColumn.selectFormula')
-                  });
-                },
-                onChange: function onChange(val) {
-                  handleFunName(val);
-                },
-                children: (_store$formulaTemplat = store.formulaTemplates) === null || _store$formulaTemplat === void 0 ? void 0 : _store$formulaTemplat.map(function (options, index) {
-                  return _jsx(Select.OptGroup, {
-                    label: options.name,
-                    children: Array.from(options.children || []).map(function (option, ind) {
-                      return _jsx(Select.Option, {
-                        value: option.id,
-                        children: option.name
-                      }, option.id || String(option.name + ind));
-                    })
-                  }, index);
-                  // <Select.Option key={index} value={option.name}>
-                  //   {option.name}
-                  // </Select.Option>
+              children: _jsx(ItemName, {
+                isError: formulaIsError(fun, formulaList),
+                message: '公式丢失',
+                children: _jsx(Select, {
+                  triggerProps: {
+                    clickToClose: true
+                  },
+                  value: fun.id || fun.name,
+                  triggerElement: function triggerElement(value) {
+                    return _jsx("div", {
+                      className: cx("Sqb-TableName Sqb-TableName-OPERATOR", {
+                        notSelected: !fun.name
+                      }),
+                      children: formulaName(fun, formulaList) || __('customColumn.selectFormula')
+                    });
+                  },
+                  onChange: function onChange(val) {
+                    handleFunName(val);
+                  },
+                  children: (_store$formulaTemplat = store.formulaTemplates) === null || _store$formulaTemplat === void 0 ? void 0 : _store$formulaTemplat.map(function (options, index) {
+                    return _jsx(Select.OptGroup, {
+                      label: options.name,
+                      children: Array.from(options.children || []).map(function (option, ind) {
+                        return _jsx(Select.Option, {
+                          value: option.id,
+                          children: option.name
+                        }, option.id || String(option.name + ind));
+                      })
+                    }, index);
+                    // <Select.Option key={index} value={option.name}>
+                    //   {option.name}
+                    // </Select.Option>
+                  })
                 })
               })
             }), fun.name && _jsxs("div", {

package/lib/es/components/dialog/formula/utils.d.ts

@@ -5,4 +5,6 @@ export declare function getParamActions(params: AtomsItem[], arity?: Arity): {
     canAdd: boolean;
     canDel: boolean;
 };
+export declare const formulaName: (fun: any, formulaList: any) => any;
 export declare const getQuotes: (fun: any, _args: AtomsItem[], formulaList: any) => string;
+export declare const formulaIsError: (fun: any, formulaList: any) => boolean;

package/lib/es/components/dialog/formula/utils.js

@@ -56,8 +56,12 @@ export function getParamActions(params, arity) {
     canDel: len > effectiveMin // 大于 min 才能删
   };
 }
+// 获取公式名称 如果找不到 用传入的name
+export var formulaName = function formulaName(fun, formulaList) {
+  var obj = formulaList[fun.id] || formulaList[fun.name];
+  return (obj === null || obj === void 0 ? void 0 : obj.name) || fun.name;
+};
 export var getQuotes = function getQuotes(fun, _args, formulaList) {
-  var _formulaList$fun$id;
   var quotes = _args === null || _args === void 0 ? void 0 : _args.map(function (v) {
     var quotes = v.list.map(function (vv, i) {
       if (vv !== null && vv !== void 0 && vv.quotes) {
@@ -70,5 +74,10 @@ export var getQuotes = function getQuotes(fun, _args, formulaList) {
     }).join(' ');
     return quotes;
   }).join(' , ');
-  return ((_formulaList$fun$id = formulaList[fun.id]) === null || _formulaList$fun$id === void 0 ? void 0 : _formulaList$fun$id.name) + ' ( ' + quotes + ' ) ';
+  // let obj = formulaList[fun.id] || formulaList[fun.name];
+  return formulaName(fun, formulaList) + ' ( ' + quotes + ' ) ';
+};
+export var formulaIsError = function formulaIsError(fun, formulaList) {
+  var obj = fun.id ? formulaList[fun.id] : formulaList[fun.name];
+  return !(obj !== null && obj !== void 0 && obj.name);
 };

package/lib/es/components/dialog/formula-list/index.js

@@ -15,12 +15,12 @@ import cx from 'classnames';
 import Metabase from '../../../index';
 import { __ } from '../../../locale';
 import isEqual from 'lodash/isEqual';
-import { getObjTem, getQuotes } from '../formula/utils';
+import { getObjTem, getQuotes, formulaIsError } from '../formula/utils';
 import { AtomsTypeEnum, FormulaTypeEnum } from '../../../store/types';
 import { ColumnsPopupThemeEnum } from '../../../store/enum';
 import { Select, Input, Modal2, Modal, InputNumber, Radio, Space, Button, Checkbox, Tooltip } from '@gingkoo/pandora';
 import cloneDeep from 'lodash/cloneDeep';
-import { buildSqlQuery, isError, changeCopyField } from '../../../utils';
+import { buildSqlQuery, isError, changeCopyField, isExistsError } from '../../../utils';
 import Formula from '../formula';
 import { AddIcon, CloseIcon } from '../../icons';
 import { Expression, SelectColumnMultiple } from '../../dialog';
@@ -32,7 +32,7 @@ import ItemName from '../../modules/components/item-name';
 import DiffViewer from '../diff-viewer';
 import storage from '../../../utils/storage';
 var FormulaList = forwardRef(function (props, ref) {
-  var _storage$_metabaseCop, _store$operatorList, _caseList2;
+  var _storage$_metabaseCop, _caseList2;
   // 响应 storage._metabaseCopyItems 变化，保证粘贴按钮能实时显示
   var _useState = useState((storage === null || storage === void 0 || (_storage$_metabaseCop = storage._metabaseCopyItems) === null || _storage$_metabaseCop === void 0 ? void 0 : _storage$_metabaseCop.length) || 0),
     _useState2 = _slicedToArray(_useState, 2),
@@ -59,8 +59,6 @@ var FormulaList = forwardRef(function (props, ref) {
     onChange = props.onChange,
     _props$customTypes = props.customTypes,
     _customTypes = _props$customTypes === void 0 ? customTypes : _props$customTypes,
-    _props$operatorList = props.operatorList,
-    _operatorList = _props$operatorList === void 0 ? ((_store$operatorList = store.operatorList) === null || _store$operatorList === void 0 ? void 0 : _store$operatorList.length) > 0 ? store.operatorList : __operatorList : _props$operatorList,
     _props$isCustom = props.isCustom,
     isCustom = _props$isCustom === void 0 ? false : _props$isCustom,
     _props$showPreview = props.showPreview,
@@ -615,20 +613,23 @@ var FormulaList = forwardRef(function (props, ref) {
   var itemDom = function itemDom(v, index) {
     var type = v.type;
     if (v.type === AtomsTypeEnum.NOT_EXISTS || v.type === AtomsTypeEnum.EXISTS) {
-      return _jsxs("div", {
-        className: "Sqb-TableName purple-name",
-        onClick: function onClick(e) {
-          return showNotExists(index);
-        },
-        children: [v.type, " ( * )", _jsx("span", {
-          style: {
-            fontSize: 0
-          },
+      return _jsx(ItemName, {
+        isError: isExistsError(v.notExists, store.existsError),
+        children: _jsxs("div", {
+          className: "Sqb-TableName purple-name",
           onClick: function onClick(e) {
-            return handleDel(e, index);
+            return showNotExists(index);
           },
-          children: _jsx(CloseIcon, {})
-        })]
+          children: [v.type, " ( * )", _jsx("span", {
+            style: {
+              fontSize: 0
+            },
+            onClick: function onClick(e) {
+              return handleDel(e, index);
+            },
+            children: _jsx(CloseIcon, {})
+          })]
+        }, index)
       }, index);
     } else if (v.type === AtomsTypeEnum.SUB_QUERY) {
       return _jsxs("div", {
@@ -738,7 +739,7 @@ var FormulaList = forwardRef(function (props, ref) {
         onChange: function onChange(val) {
           handleConstant(val, index);
         },
-        children: _operatorList.map(function (option, index) {
+        children: operatorList.map(function (option, index) {
           return _jsx(Select.Option, {
             value: option,
             children: option
@@ -748,8 +749,8 @@ var FormulaList = forwardRef(function (props, ref) {
     } else if (type === AtomsTypeEnum.CONSTANT) {
       //常量
       return _jsx(ItemName, {
-        isError: !getConstantLabel(store.constantList, v.id || v.val),
-        message: "\u5E38\u91CF\u5B57\u6BB5\u672A\u80FD\u6B63\u786E\u5BF9\u5E94",
+        isError: (v.id || v.val) && !getConstantLabel(store.constantList, v.id || v.val),
+        message: "\u5E38\u91CF\u4E22\u5931",
         children: _jsxs("div", {
           className: cx("Sqb-TableName", {
             notSelected: !v.val
@@ -769,7 +770,7 @@ var FormulaList = forwardRef(function (props, ref) {
         })
       }, index);
     } else if (type === AtomsTypeEnum.EXPRESSION) {
-      if (v.condition === '早于' && v.rhs.length === 2) {
+      if (~['早于', '晚于', '在'].indexOf(v.condition) && v.rhs.length > 1) {
         var _caseList$index$quote;
         var _caseList = caseList.slice();
         _caseList[index].rhs = [_caseList[index].rhs[0]];
@@ -800,7 +801,8 @@ var FormulaList = forwardRef(function (props, ref) {
     } else if (type === AtomsTypeEnum.FORMULA) {
       // 公式
       return _jsx(ItemName, {
-        isError: isError(v, data),
+        isError: isError(v, data) || formulaIsError(v, formulaList),
+        message: formulaIsError(v, formulaList) ? '公式丢失' : '',
         children: _jsxs("div", {
           className: cx("Sqb-TableName gray-name"),
           onClick: function onClick(e) {