@gingkoo/pandora-metabase 1.0.118 → 1.0.120

package/lib/es/components/popup.js

@@ -8,11 +8,12 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
-import { getWindowSize } from '../utils/helper-dom';
+import { getWindowSize, getTopLayerZIndex } from '../utils/helper-dom';
 import { winResetEvent } from '../utils/event';
 import Portal from '../common/Portal';
 var outSpacing = 10;
-var TriggerInternal = /*#__PURE__*/function (_React$Component) {
+var popupOrderSeed = 1;
+var TriggerInternal = function (_React$Component) {
   function TriggerInternal(props) {
     var _this;
     _classCallCheck(this, TriggerInternal);
@@ -24,11 +25,21 @@ var TriggerInternal = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "scrollHeightCheckTimer", null);
     _defineProperty(_this, "lastScrollHeight", 0);
     _defineProperty(_this, "handleClickOutside", function (e) {
-      var ele = e.target;
-      while (ele) {
-        if (ele === _this.props.node) return;
-        if (_this.popupContainer && ele === _this.popupContainer) return;
-        ele = ele.parentNode;
+      var _this$props$node, _this$props$node$cont, _this$popupContainer;
+      var target = e.target;
+      if (!target) {
+        _this.closePopup();
+        return;
+      }
+      if ((_this$props$node = _this.props.node) !== null && _this$props$node !== void 0 && (_this$props$node$cont = _this$props$node.contains) !== null && _this$props$node$cont !== void 0 && _this$props$node$cont.call(_this$props$node, target)) return;
+      if ((_this$popupContainer = _this.popupContainer) !== null && _this$popupContainer !== void 0 && _this$popupContainer.contains(target)) return;
+      var clickedPopupContainer = target instanceof Element ? target.closest('[data-sqb-popup-container="true"]') : null;
+      if (clickedPopupContainer && _this.popupContainer) {
+        var currentOrder = Number(_this.popupContainer.getAttribute('data-sqb-popup-order') || 0);
+        var clickedOrder = Number(clickedPopupContainer.getAttribute('data-sqb-popup-order') || 0);
+        if (clickedOrder > currentOrder) {
+          return;
+        }
       }
       _this.closePopup();
     });
@@ -37,7 +48,7 @@ var TriggerInternal = /*#__PURE__*/function (_React$Component) {
       _this.createPopupContainer();
       _this.resetId = winResetEvent.addEvent(_this.didUpdate, _this, 300);
       window.addEventListener('scroll', _this.didUpdate, true);
-      document.body.addEventListener('click', _this.handleClickOutside, false);
+      document.addEventListener('mousedown', _this.handleClickOutside, true);
       _this.initContentResizeObserver();
       _this.startScrollHeightCheck();
       setTimeout(function () {
@@ -60,7 +71,7 @@ var TriggerInternal = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "cleanup", function () {
       winResetEvent.removeEvent(_this.resetId);
       window.removeEventListener('scroll', _this.didUpdate, true);
-      document.body.removeEventListener('click', _this.handleClickOutside, false);
+      document.removeEventListener('mousedown', _this.handleClickOutside, true);
       if (_this.resizeObserver) {
         _this.resizeObserver.disconnect();
         _this.resizeObserver = null;
@@ -95,7 +106,6 @@ var TriggerInternal = /*#__PURE__*/function (_React$Component) {
         _this.didUpdate();
       });
       _this.contentResizeObserver.observe(targetNode);
-      // 额外监听图片加载
       var images = targetNode.querySelectorAll('img');
       images.forEach(function (img) {
         if (!img.complete) {
@@ -127,7 +137,12 @@ var TriggerInternal = /*#__PURE__*/function (_React$Component) {
       var _this$props$zIndex;
       if (_this.popupContainer) return;
       var container = document.createElement('span');
-      container.style.cssText = "\n      position: absolute;\n      top: 0;\n      left: 0;\n      pointer-events: none;\n      z-index: ".concat((_this$props$zIndex = _this.props.zIndex) !== null && _this$props$zIndex !== void 0 ? _this$props$zIndex : 999, ";\n      opacity: 0;\n      transition: opacity 0.2s ease;\n      will-change: transform;\n    ");
+      container.setAttribute('data-sqb-popup-container', 'true');
+      container.setAttribute('data-sqb-popup-order', String(popupOrderSeed++));
+      var baseZIndex = Number((_this$props$zIndex = _this.props.zIndex) !== null && _this$props$zIndex !== void 0 ? _this$props$zIndex : 999);
+      var normalizedBaseZIndex = Number.isNaN(baseZIndex) ? 999 : baseZIndex;
+      var containerZIndex = Math.max(normalizedBaseZIndex, getTopLayerZIndex() + 1);
+      container.style.cssText = "\n      position: absolute;\n      top: 0;\n      left: 0;\n      pointer-events: none;\n      z-index: ".concat(containerZIndex, ";\n      opacity: 0;\n      transition: opacity 0.2s ease;\n      will-change: transform;\n    ");
       document.body.appendChild(container);
       _this.popupContainer = container;
     });
@@ -169,17 +184,12 @@ var TriggerInternal = /*#__PURE__*/function (_React$Component) {
         innerSpacing = _this$props$innerSpac === void 0 ? 10 : _this$props$innerSpac,
         _this$props$outSpacin = _this$props.outSpacing,
         outSpacing = _this$props$outSpacin === void 0 ? 5 : _this$props$outSpacin;
-      // 假设 outSpacing 也是 props 或者常量，这里保持与你原代码一致，若未定义请确保其存在
-      // const outSpacing = this.props.outSpacing || 0;
       var rect = node.getBoundingClientRect();
-      // --- 垂直方向逻辑 (保持原样) ---
       var triggerTop = rect.top + window.scrollY;
-      var triggerLeft = rect.left + window.scrollX; // 基准左侧位置
+      var triggerLeft = rect.left + window.scrollX;
       var triggerHeight = rect.height;
       var popupContent = _this.ref.current;
       var realHeight = popupContent.scrollHeight;
-      // 获取弹窗的实际宽度，用于水平碰撞检测
-      // 注意：此时 popupContent 可能还没有被渲染到最终位置，但 scrollWidth 通常能反映内容宽度
       var realWidth = popupContent.scrollWidth;
       var _getWindowSize = getWindowSize(),
         viewportHeight = _getWindowSize.height,
@@ -195,31 +205,15 @@ var TriggerInternal = /*#__PURE__*/function (_React$Component) {
         maxHeight = Math.min(realHeight, spaceAbove - innerSpacing - outSpacing);
         topPosition = triggerTop - innerSpacing - maxHeight;
       }
-      // --- 水平方向逻辑 (新增) ---
       var leftPosition = triggerLeft;
-      // 1. 检查是否超出右侧边界
       if (leftPosition + realWidth > viewportWidth) {
-        // 如果超出，尝试向左移动，使弹窗右边缘对齐屏幕右边缘
         leftPosition = viewportWidth - realWidth;
       }
-      // 2. 检查是否超出左侧边界 (兜底策略)
-      // 如果弹窗太宽，或者触发点太靠左导致上面的计算结果小于0
       if (leftPosition < 0) {
         leftPosition = 0;
-        // 可选：如果弹窗比屏幕还宽，你可能希望限制它的最大宽度为屏幕宽度
-        // 此时需要重新计算 realWidth 或者直接限制样式
-        // 这里我们通过 CSS 的 maxWidth 来配合，或者在这里强制限制 width
-        // 如果必须通过 JS 控制宽度：
-        // popupContent.style.width = `${viewportWidth}px`;
-        // leftPosition = 0;
       }
-      // --- 应用样式 ---
-      // 使用 transform 进行定位
       _this.popupContainer.style.transform = "translate(".concat(leftPosition, "px, ").concat(topPosition, "px)");
-      // 设置最大高度
       popupContent.style.maxHeight = "".concat(maxHeight, "px");
-      // 【重要】为了防止第2步中弹窗过宽超出屏幕，建议同时限制 popupContent 的最大宽度
-      // 这样即使 leftPosition=0，内容也不会撑破屏幕
       popupContent.style.maxWidth = "".concat(viewportWidth - outSpacing * 2, "px");
     });
     _this.state = {

package/lib/es/hooks/patch.d.ts

@@ -2,4 +2,5 @@ import { MetaListType } from '../store/types';
 export declare const joinDataPatch: (newMeta: any, constantList: any, formulaTemplates: any) => any;
 export declare const filterPatch: (newMeta: any, constantList: any, formulaTemplates: any) => any;
 export declare const customColumnPatch: (newMeta: any, constantList: any, formulaTemplates: any) => any;
+export declare const summarizePatch: (newMeta: any, constantList: any, formulaTemplates: any) => any;
 export declare const patchMetas: (items: MetaListType[], constantList: any[], formulaTemplates: any[]) => MetaListType[];

package/lib/es/hooks/patch.js

@@ -1,5 +1,29 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { TypeEnum } from '../store/enum';
+var SQL_ALIAS_MAX_LENGTH = 30;
+var normalizeSqlAlias = function normalizeSqlAlias() {
+  var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  var index = arguments.length > 1 ? arguments[1] : undefined;
+  var fallbackAlias = "group_by_".concat(index + 1);
+  var alias = value.replace(/[^a-zA-Z0-9_]/g, '_').replace(/_+/g, '_').replace(/^_+|_+$/g, '');
+  if (!/^[a-zA-Z]/.test(alias)) {
+    alias = "a_".concat(alias.replace(/^[^a-zA-Z]+/, ''));
+  }
+  if (!/^[a-zA-Z]/.test(alias)) {
+    alias = fallbackAlias;
+  }
+  if (alias.length > SQL_ALIAS_MAX_LENGTH) {
+    var uniqueSuffix = "_".concat(index + 1);
+    var maxBaseLength = Math.max(1, SQL_ALIAS_MAX_LENGTH - uniqueSuffix.length);
+    alias = "".concat(alias.slice(0, maxBaseLength)).concat(uniqueSuffix);
+  }
+  return alias.slice(0, SQL_ALIAS_MAX_LENGTH);
+};
+var isValidSqlAlias = function isValidSqlAlias() {
+  var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  if (!value) return true;
+  return /^[a-zA-Z][a-zA-Z0-9_]{0,29}$/.test(value);
+};
 var setConstantId = function setConstantId(item, constantList) {
   constantList === null || constantList === void 0 || constantList.map(function (v) {
     if (v.label === item.val) {
@@ -15,7 +39,6 @@ var setFormulaId = function setFormulaId(item, formulaTemplates) {
   }
   return item;
 };
-// 关联
 export var joinDataPatch = function joinDataPatch(newMeta, constantList, formulaTemplates) {
   var _newMeta$expressions;
   newMeta.expressions = (_newMeta$expressions = newMeta.expressions) === null || _newMeta$expressions === void 0 ? void 0 : _newMeta$expressions.map(function (v, i) {
@@ -36,7 +59,6 @@ export var joinDataPatch = function joinDataPatch(newMeta, constantList, formula
   });
   return newMeta;
 };
-// 过滤器
 export var filterPatch = function filterPatch(newMeta, constantList, formulaTemplates) {
   var _newMeta$filter;
   var _filter = (_newMeta$filter = newMeta.filter) === null || _newMeta$filter === void 0 ? void 0 : _newMeta$filter.map(function (v) {
@@ -72,7 +94,6 @@ export var filterPatch = function filterPatch(newMeta, constantList, formulaTemp
         return arg;
       });
       return _v;
-      // return setFormulaId(v, formulaTemplates);
     }
     if (v.type === 'exists' || v.type === 'notExists') {
       v.notExists = _patchMetas(v.notExists, constantList, formulaTemplates);
@@ -82,7 +103,6 @@ export var filterPatch = function filterPatch(newMeta, constantList, formulaTemp
   newMeta.filter = _filter;
   return newMeta;
 };
-// 自定义
 export var customColumnPatch = function customColumnPatch(newMeta, constantList, formulaTemplates) {
   var _newMeta$customColumn;
   newMeta.customColumn = (newMeta === null || newMeta === void 0 || (_newMeta$customColumn = newMeta.customColumn) === null || _newMeta$customColumn === void 0 ? void 0 : _newMeta$customColumn.map(function (v) {
@@ -119,7 +139,82 @@ export var customColumnPatch = function customColumnPatch(newMeta, constantList,
   })) || newMeta.customColumn;
   return newMeta;
 };
-// 兼容
+export var summarizePatch = function summarizePatch(newMeta, constantList, formulaTemplates) {
+  var _newMeta$group, _newMeta$by;
+  newMeta.group = ((_newMeta$group = newMeta.group) === null || _newMeta$group === void 0 ? void 0 : _newMeta$group.map(function (item, index) {
+    var _item$atoms;
+    var atoms = (_item$atoms = item.atoms) === null || _item$atoms === void 0 ? void 0 : _item$atoms.map(function (formula) {
+      if (formula.type === 'expression') {
+        var _formula$lhs2, _formula$rhs2;
+        formula.lhs = (_formula$lhs2 = formula.lhs) === null || _formula$lhs2 === void 0 ? void 0 : _formula$lhs2.map(function (vv) {
+          if (vv.type === 'constant' && !vv.id) {
+            return setConstantId(vv, constantList);
+          }
+          return vv;
+        });
+        formula.rhs = (_formula$rhs2 = formula.rhs) === null || _formula$rhs2 === void 0 ? void 0 : _formula$rhs2.map(function (vv) {
+          if (vv.type === 'constant' && !vv.id) {
+            return setConstantId(vv, constantList);
+          }
+          return vv;
+        });
+      } else if (formula.type === 'constant' && !formula.id) {
+        return setConstantId(formula, constantList);
+      } else if (formula.type === 'FORMULA' && !formula.id) {
+        return setFormulaId(formula, formulaTemplates);
+      } else if (formula.type === 'exists' || formula.type === 'notExists') {
+        return _objectSpread(_objectSpread({}, formula), {}, {
+          notExists: _patchMetas(formula.notExists, constantList, formulaTemplates)
+        });
+      }
+      return formula;
+    });
+    var nextItem = _objectSpread(_objectSpread({}, item), {}, {
+      atoms: atoms
+    });
+    if (!isValidSqlAlias(nextItem.fieldAlias)) {
+      nextItem.fieldAlias = normalizeSqlAlias(nextItem.fieldAlias || nextItem.name || "group_".concat(index + 1), index);
+    }
+    return nextItem;
+  })) || newMeta.group;
+  newMeta.by = ((_newMeta$by = newMeta.by) === null || _newMeta$by === void 0 ? void 0 : _newMeta$by.map(function (item, index) {
+    var _item$atoms2;
+    var atoms = (_item$atoms2 = item.atoms) === null || _item$atoms2 === void 0 ? void 0 : _item$atoms2.map(function (formula) {
+      if (formula.type === 'expression') {
+        var _formula$lhs3, _formula$rhs3;
+        formula.lhs = (_formula$lhs3 = formula.lhs) === null || _formula$lhs3 === void 0 ? void 0 : _formula$lhs3.map(function (vv) {
+          if (vv.type === 'constant' && !vv.id) {
+            return setConstantId(vv, constantList);
+          }
+          return vv;
+        });
+        formula.rhs = (_formula$rhs3 = formula.rhs) === null || _formula$rhs3 === void 0 ? void 0 : _formula$rhs3.map(function (vv) {
+          if (vv.type === 'constant' && !vv.id) {
+            return setConstantId(vv, constantList);
+          }
+          return vv;
+        });
+      } else if (formula.type === 'constant' && !formula.id) {
+        return setConstantId(formula, constantList);
+      } else if (formula.type === 'FORMULA' && !formula.id) {
+        return setFormulaId(formula, formulaTemplates);
+      } else if (formula.type === 'exists' || formula.type === 'notExists') {
+        return _objectSpread(_objectSpread({}, formula), {}, {
+          notExists: _patchMetas(formula.notExists, constantList, formulaTemplates)
+        });
+      }
+      return formula;
+    });
+    var nextItem = _objectSpread(_objectSpread({}, item), {}, {
+      atoms: atoms
+    });
+    if (!isValidSqlAlias(nextItem.fieldAlias)) {
+      nextItem.fieldAlias = normalizeSqlAlias(nextItem.fieldAlias || nextItem.name || "group_by_".concat(index + 1), index);
+    }
+    return nextItem;
+  })) || newMeta.by;
+  return newMeta;
+};
 var _patchMetas = function patchMetas(items, constantList, formulaTemplates) {
   return (items === null || items === void 0 ? void 0 : items.map(function (v) {
     if (v.type === TypeEnum.joinData) {
@@ -131,6 +226,9 @@ var _patchMetas = function patchMetas(items, constantList, formulaTemplates) {
     if (v.type === TypeEnum.customColumn) {
       v = customColumnPatch(v, constantList, formulaTemplates);
     }
+    if (v.type === TypeEnum.summarize) {
+      v = summarizePatch(v, constantList, formulaTemplates);
+    }
     if (v.type === TypeEnum.union) {
       v.subquery = _patchMetas(v.subquery || [], constantList, formulaTemplates);
     }

package/lib/es/hooks/patch2.js

@@ -4,54 +4,19 @@ import { buildSqlQuery } from '../utils';
 import { AtomsTypeEnum } from '../store/types';
 import { TypeEnum } from '../store/enum';
 export var dataPatch = function dataPatch(newMeta) {
-  // let item = newMeta.expressions?.[0] || {};
-  // if (item?.type && Object.values(AtomsTypeEnum).includes(item.type)) {
-  //   if (item.type === AtomsTypeEnum.EXPRESSION && item.lhs) {
-  //     return newMeta;
-  //   }
-  // }
   newMeta.subquery = _patchMetas(newMeta.subquery);
   return newMeta;
 };
 export var joinDataPatch = function joinDataPatch(newMeta) {
   var _fields, _fields2, _fields3, _fields4, _newMeta$expressions;
-  // let item = newMeta.expressions?.[0] || {};
-  // if (item?.type && Object.values(AtomsTypeEnum).includes(item.type)) {
-  //   if (
-  //     (item.type === AtomsTypeEnum.EXPRESSION || item.type === AtomsTypeEnum.JOIN_DEFAULT) &&
-  //     item.lhs
-  //   ) {
-  //     return newMeta;
-  //   }
-  //   if (item.type === AtomsTypeEnum.EXISTS && !item.tableUuid) {
-  //     return newMeta;
-  //   }
-  //   if (item.type === AtomsTypeEnum.NOT_EXISTS && !item.tableUuid) {
-  //     return newMeta;
-  //   }
-  //   if (item.type === AtomsTypeEnum.FIELD && item.fieldName) {
-  //     return newMeta;
-  //   }
-  // }
-  // if (
-  //   newMeta.expressions?.[0]?.type &&
-  //   Object.values(AtomsTypeEnum).includes(newMeta.expressions[0].type)
-  // ) {
-  //   return newMeta;
-  // }
   var fields1 = newMeta.table1.fields || [];
   var fields2 = newMeta.table2.fields || [];
-  // 处理老字段
   var field1 = {
     fieldAlias: newMeta.table1.fieldAlias || newMeta.table1.column || newMeta.table1.name,
     fieldUuid: newMeta.table1.fieldUuid || uuidv4('field'),
     fieldId: newMeta.table1.fieldId,
     fieldNameZh: newMeta.table1.name_zh,
     fieldName: newMeta.table1.fieldName || newMeta.table1.name
-    // quotes: newMeta.table1.quotes || newMeta.table1.column,
-    // tableUuid: newMeta.table1.tableUuid,
-    // tableId: newMeta.table1.datasourceId,
-    // tableAlias: newMeta.table1.alias,
   };
   var field2 = {
     fieldAlias: newMeta.table2.fieldAlias || newMeta.table2.column || newMeta.table2.name,
@@ -60,53 +25,20 @@ export var joinDataPatch = function joinDataPatch(newMeta) {
     fieldNameZh: newMeta.table2.name_zh,
     fieldName: newMeta.table2.fieldName || newMeta.table2.name
   };
-  // 处理多选
   if (field1.fieldAlias && ((_fields = fields1) === null || _fields === void 0 ? void 0 : _fields.length) < 1) {
     fields1 = [_objectSpread(_objectSpread({}, field1), {}, {
-      // quotes: field1.quotes,
       fieldUuid: field1.fieldUuid,
       fieldAlias: field1.fieldAlias,
       fieldId: field1.fieldId
-      // fieldNameZh: newMeta.table1.name_zh,
-      // fieldName: newMeta.table1.fieldName || newMeta.table1.name,
-      // tableAlias: newMeta.table1.alias,
-      // tableId: newMeta.table1.id,
-      // tableName: newMeta.table1.name,
-      // tableNameZh: newMeta.table1.name_zh,
-      // tableUuid: newMeta.table1.tableUuid,
-      // datasourceName: newMeta.table1.datasourceName, // 数据源名
-      // datasourceId: newMeta.table1.datasourceId, // 数据源id
     })];
   }
   if (field2.fieldAlias && ((_fields2 = fields2) === null || _fields2 === void 0 ? void 0 : _fields2.length) < 1) {
     fields2 = [_objectSpread(_objectSpread({}, field2), {}, {
-      // quotes: field2.quotes,
       fieldUuid: field2.fieldUuid,
       fieldAlias: field2.fieldAlias,
       fieldId: field2.fieldId
-      // fieldNameZh: newMeta.table2.name_zh,
-      // fieldName: newMeta.table2.fieldName || newMeta.table2.name,
-      // tableAlias: newMeta.table2.alias,
-      // tableId: newMeta.table2.id,
-      // tableName: newMeta.table2.name,
-      // tableNameZh: newMeta.table2.name_zh,
-      // tableUuid: newMeta.table2.tableUuid,
-      // datasourceName: newMeta.table2.datasourceName, // 数据源名
-      // datasourceId: newMeta.table2.datasourceId, // 数据源id
     })];
   }
-  // newMeta.table1 = {
-  //   ...newMeta.table1,
-  //   ...field1,
-  //   tableUuid: newMeta.table1.tableUuid || uuidv4('table'),
-  //   fields: fields1,
-  // };
-  // newMeta.table2 = {
-  //   ...newMeta.table2,
-  //   ...field2,
-  //   tableUuid: newMeta.table2.tableUuid || uuidv4('table'),
-  //   fields: fields2,
-  // };
   var beforeExpressions = [];
   if (((_fields3 = fields1) === null || _fields3 === void 0 ? void 0 : _fields3.length) > 0 || ((_fields4 = fields2) === null || _fields4 === void 0 ? void 0 : _fields4.length) > 0) {
     beforeExpressions = [{
@@ -119,17 +51,13 @@ export var joinDataPatch = function joinDataPatch(newMeta) {
       right_string: '',
       right_fields: fields2 || [],
       right_type: 'field',
-      type: 'default' // 默认是字段模式
+      type: 'default'
     }];
   }
   var expressions = ((_newMeta$expressions = newMeta.expressions) === null || _newMeta$expressions === void 0 ? void 0 : _newMeta$expressions.map(function (v) {
     var _left_fields, _right_fields;
     var left_fields = v.left_fields || [];
     var right_fields = v.right_fields || [];
-    // if (v.type !== 'default') {
-    //   return v;
-    // }
-    // 先处理老数据的字段
     var left_field = {
       left_fieldAlias: v.left_fieldAlias || v.left_column,
       left_fieldUuid: v.left_fieldUuid || uuidv4('field'),
@@ -140,15 +68,11 @@ export var joinDataPatch = function joinDataPatch(newMeta) {
       right_fieldUuid: v.right_fieldUuid || uuidv4('field'),
       right_quotes: v.right_quotes || v.right_column
     };
-    // 再处理多选
     if (left_field.left_fieldAlias && ((_left_fields = left_fields) === null || _left_fields === void 0 ? void 0 : _left_fields.length) < 1) {
       left_fields = [{
         fieldAlias: left_field.left_fieldAlias,
         fieldUuid: left_field.left_fieldUuid,
         quotes: left_field.left_quotes
-        // tableUuid: newMeta.table1.tableUuid,
-        // tableId: newMeta.table1.datasourceId,
-        // tableAlias: newMeta.table1.alias,
       }];
     }
     if (right_field.right_fieldAlias && ((_right_fields = right_fields) === null || _right_fields === void 0 ? void 0 : _right_fields.length) < 1) {
@@ -156,9 +80,6 @@ export var joinDataPatch = function joinDataPatch(newMeta) {
         fieldAlias: right_field.right_fieldAlias,
         fieldUuid: right_field.right_fieldUuid,
         quotes: right_field.right_quotes
-        // tableUuid: newMeta.table2.tableUuid,
-        // tableId: newMeta.table2.datasourceId,
-        // tableAlias: newMeta.table2.alias,
       }];
     }
     return {
@@ -171,7 +92,7 @@ export var joinDataPatch = function joinDataPatch(newMeta) {
       right_string: v.right_string || '',
       right_fields: right_fields,
       right_type: v.right_type || '',
-      type: v.type || 'default' // 默认是字段模式
+      type: v.type || 'default'
     };
   })) || [];
   var _expressions = beforeExpressions.concat(expressions);
@@ -201,9 +122,7 @@ export var joinDataPatch = function joinDataPatch(newMeta) {
           tableNameZh: newMeta.table1.name_zh,
           tableUuid: newMeta.table1.tableUuid,
           datasourceName: newMeta.table1.datasourceName,
-          // 数据源名
           datasourceId: newMeta.table1.datasourceId,
-          // 数据源id
           type: AtomsTypeEnum.FIELD
         }, vv);
       });
@@ -230,9 +149,7 @@ export var joinDataPatch = function joinDataPatch(newMeta) {
           tableNameZh: newMeta.table2.name_zh,
           tableUuid: newMeta.table2.tableUuid,
           datasourceName: newMeta.table2.datasourceName,
-          // 数据源名
           datasourceId: newMeta.table2.datasourceId,
-          // 数据源id
           type: AtomsTypeEnum.FIELD
         }, vv);
       });
@@ -240,9 +157,7 @@ export var joinDataPatch = function joinDataPatch(newMeta) {
     var item = {
       lhs: lhs,
       rhs: rhs,
-      // database_type: '',
       condition: '',
-      // quotes: '',
       type: AtomsTypeEnum.JOIN_DEFAULT
     };
     newExpressions.push(item);
@@ -254,9 +169,7 @@ export var joinDataPatch = function joinDataPatch(newMeta) {
     }
     return item;
   });
-  // 清除table1中不用字段
   delete newMeta.table1.fields;
-  // 清除table2中不用字段
   delete newMeta.table2.fields;
   newMeta.subquery = _patchMetas(newMeta.subquery);
   newMeta.expressions = newExpressions;
@@ -264,23 +177,7 @@ export var joinDataPatch = function joinDataPatch(newMeta) {
 };
 export var filterPatch = function filterPatch(newMeta) {
   var _newMeta$filter;
-  // let item = newMeta.filter?.[0] || {};
-  // if (item?.type && Object.values(AtomsTypeEnum).includes(item.type)) {
-  //   if (item.type === AtomsTypeEnum.EXPRESSION && item.lhs) {
-  //     return newMeta;
-  //   }
-  //   if (item.type === AtomsTypeEnum.EXISTS && !item.tableUuid) {
-  //     return newMeta;
-  //   }
-  //   if (item.type === AtomsTypeEnum.NOT_EXISTS && !item.tableUuid) {
-  //     return newMeta;
-  //   }
-  //   if (item.type === AtomsTypeEnum.FIELD && item.fieldName) {
-  //     return newMeta;
-  //   }
-  // }
   var _filter = (_newMeta$filter = newMeta.filter) === null || _newMeta$filter === void 0 ? void 0 : _newMeta$filter.map(function (v) {
-    // 表达式
     var tem;
     if (typeof v === 'string') {
       return {
@@ -372,21 +269,6 @@ export var filterPatch = function filterPatch(newMeta) {
 };
 export var customColumnPatch = function customColumnPatch(newMeta) {
   var _newMeta$customColumn;
-  // let item = newMeta.customColumn?.[0]?.formulaList?.[0] || {};
-  // if (item?.type && Object.values(AtomsTypeEnum).includes(item.type)) {
-  //   if (item.type === AtomsTypeEnum.EXPRESSION && item.lhs) {
-  //     return newMeta;
-  //   }
-  //   if (item.type === AtomsTypeEnum.EXISTS && !item.tableUuid) {
-  //     return newMeta;
-  //   }
-  //   if (item.type === AtomsTypeEnum.NOT_EXISTS && !item.tableUuid) {
-  //     return newMeta;
-  //   }
-  //   if (item.type === AtomsTypeEnum.FIELD && item.fieldName) {
-  //     return newMeta;
-  //   }
-  // }
   newMeta.customColumn = (newMeta === null || newMeta === void 0 || (_newMeta$customColumn = newMeta.customColumn) === null || _newMeta$customColumn === void 0 ? void 0 : _newMeta$customColumn.map(function (v) {
     var _formulaList = v.formulaList.map(function (formula) {
       var tem = formula;
@@ -406,7 +288,6 @@ export var customColumnPatch = function customColumnPatch(newMeta) {
             tableUuid: formula.expression.table2.tableUuid,
             datasourceName: formula.expression.table2.datasourceName,
             datasourceId: formula.expression.table2.datasourceId,
-            // quotes: formula.expression.table2.quotes,
             type: AtomsTypeEnum.FIELD
           }];
         } else if (formula.expression.valType === 'constant') {
@@ -444,7 +325,6 @@ export var customColumnPatch = function customColumnPatch(newMeta) {
             tableUuid: formula.expression.tableUuid,
             datasourceName: formula.expression.datasourceName,
             datasourceId: formula.expression.datasourceId,
-            // quotes: formula.expression.name,
             type: AtomsTypeEnum.FIELD
           }],
           rhs: rhs,
@@ -468,7 +348,6 @@ export var customColumnPatch = function customColumnPatch(newMeta) {
           tableUuid: formula.expression.tableUuid,
           datasourceName: formula.expression.datasourceName,
           datasourceId: formula.expression.datasourceId,
-          // quotes: formula.expression.quotes,
           type: AtomsTypeEnum.FIELD
         };
       } else if (formula.type === 'operator') {
@@ -487,7 +366,6 @@ export var customColumnPatch = function customColumnPatch(newMeta) {
           type: AtomsTypeEnum.INPUT_STRING
         };
       } else if (formula.type === 'notExists') {
-        //应该是多余
         return {
           notExists: v.expression.notExists,
           quotes: v.expression.quotes,
@@ -505,21 +383,6 @@ export var customColumnPatch = function customColumnPatch(newMeta) {
 };
 export var sortPatch = function sortPatch(newMeta) {
   var _newMeta$sort;
-  // let item = newMeta.sort?.[0].expression?.[0] || {};
-  // if (item?.type && Object.values(AtomsTypeEnum).includes(item.type)) {
-  //   if (item.type === AtomsTypeEnum.EXPRESSION && item.lhs) {
-  //     return newMeta;
-  //   }
-  //   if (item.type === AtomsTypeEnum.EXISTS && !item.tableUuid) {
-  //     return newMeta;
-  //   }
-  //   if (item.type === AtomsTypeEnum.NOT_EXISTS && !item.tableUuid) {
-  //     return newMeta;
-  //   }
-  //   if (item.type === AtomsTypeEnum.FIELD && item.fieldName) {
-  //     return newMeta;
-  //   }
-  // }
   var _sort = (_newMeta$sort = newMeta.sort) === null || _newMeta$sort === void 0 ? void 0 : _newMeta$sort.map(function (v) {
     return {
       expression: [{
@@ -566,29 +429,4 @@ var _patchMetas = function patchMetas(items) {
     return v;
   })) || [];
 };
-// export const patchMetas1 = (items: MetaListType[]) => {
-//   return (
-//     items?.map((v: MetaListType): MetaListType => {
-//       // if (v.type === TypeEnum.data) {
-//       //   v = dataPatch(v);
-//       // }
-//       // if (v.type === TypeEnum.joinData) {
-//       //   v = joinDataPatch(v);
-//       // }
-//       // if (v.type === TypeEnum.filter) {
-//       //   v = filterPatch(v);
-//       // }
-//       // if (v.type === TypeEnum.sort) {
-//       //   v = sortPatch(v);
-//       // }
-//       // if (v.type === TypeEnum.customColumn) {
-//       //   v = customColumnPatch(v);
-//       // }
-//       if (v.type === TypeEnum.union) {
-//         v.subquery = patchMetas(v.subquery || []);
-//       }
-//       return v;
-//     }) || []
-//   );
-// };
 export { _patchMetas as patchMetas };

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

@@ -1,8 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { createContext, useContext } from 'react';
-// 创建 Context
 var Context = createContext({});
-// 创建 Provider 组件
 export var Provider = function Provider(_ref) {
   var value = _ref.value,
     children = _ref.children;
@@ -11,7 +9,6 @@ export var Provider = function Provider(_ref) {
     children: children
   });
 };
-// 自定义 Hook 来使用 Context
 export var useStore = function useStore() {
   return useContext(Context);
 };