@gingkoo/pandora-metabase 1.0.82 → 1.0.84

package/lib/es/components/popup.js

@@ -166,15 +166,24 @@ var TriggerInternal = /*#__PURE__*/function (_React$Component) {
       var _this$props = _this.props,
         node = _this$props.node,
         _this$props$innerSpac = _this$props.innerSpacing,
-        innerSpacing = _this$props$innerSpac === void 0 ? 10 : _this$props$innerSpac;
+        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;
+        viewportHeight = _getWindowSize.height,
+        viewportWidth = _getWindowSize.width;
       var spaceBelow = viewportHeight - rect.bottom;
       var spaceAbove = rect.top;
       var topPosition;
@@ -186,8 +195,32 @@ var TriggerInternal = /*#__PURE__*/function (_React$Component) {
         maxHeight = Math.min(realHeight, spaceAbove - innerSpacing - outSpacing);
         topPosition = triggerTop - innerSpacing - maxHeight;
       }
-      _this.popupContainer.style.transform = "translate(".concat(triggerLeft, "px, ").concat(topPosition, "px)");
+      // --- 水平方向逻辑 (新增) ---
+      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 = {
       popupRefreshKey: 1

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

@@ -9,6 +9,7 @@ import { useEffect, useState, useRef, useMemo } from 'react';
 import { uuidv4 } from '../utils/helper';
 import { TypeEnum, JoinEnum, UnionEnum } from '../store/enum';
 import { splitByUnion } from '../utils';
+import storage from '../utils/storage';
 import cloneDeep from 'lodash/cloneDeep';
 import { findIndex } from '../utils';
 var metaKey = 1;
@@ -172,6 +173,18 @@ var useStore = function useStore() {
     _useState60 = _slicedToArray(_useState59, 2),
     sourceData = _useState60[0],
     setSourceData = _useState60[1]; // 原始数据
+  var _useState61 = useState(false),
+    _useState62 = _slicedToArray(_useState61, 2),
+    moduleCopy = _useState62[0],
+    setModuleCopy = _useState62[1]; // 是否开启模块复制功能
+  var _useState63 = useState(false),
+    _useState64 = _slicedToArray(_useState63, 2),
+    isMetabaseCopy = _useState64[0],
+    setIsMetabaseCopy = _useState64[1]; // 是否开启勾选组复制
+  var _useState65 = useState(storage._metabaseCopyModule || []),
+    _useState66 = _slicedToArray(_useState65, 2),
+    metabaseCopyModule = _useState66[0],
+    setMetabaseCopyModule = _useState66[1]; // 复制的内容
   // 外层ref
   var popupContainer = useRef();
   // const [fetchDatasetFn, setFetchDatasetFn] = useState<(id: string) => Promise<any>>(
@@ -538,9 +551,10 @@ var useStore = function useStore() {
       _setMeta(defaultMeta);
     }
   };
-  var addMeta = function addMeta(type, index, groupIndex) {
+  var getNewMeta = function getNewMeta(_type, index, groupIndex, obj) {
+    var type = _type || obj.type;
+    var item = false;
     var newMeta = metaList[groupIndex].list.slice();
-    var item;
     var mainTable = newMeta[0];
     metaKey += 1;
     if (type === TypeEnum.joinData) {
@@ -647,10 +661,30 @@ var useStore = function useStore() {
       var newMetaList = metaList.slice();
       newMetaList.splice.apply(newMetaList, [groupIndex + 1, 0, defaultOperator].concat(defaultMeta));
       _setMeta(newMetaList);
+      return false;
+    }
+    if (obj) {
+      item = _objectSpread(_objectSpread({}, obj), {}, {
+        metaKey: metaKey
+      });
+    }
+    return item;
+  };
+  var addMeta = function addMeta(type, index, groupIndex, obj) {
+    var newMeta = metaList[groupIndex].list.slice();
+    var items = [];
+    if (obj) {
+      items = obj.map(function (v) {
+        return getNewMeta(type, index, groupIndex, v);
+      });
+    } else {
+      items = [getNewMeta(type, index, groupIndex, obj)];
+    }
+    if (items[0] === false) {
       return;
     }
     // @ts-ignore
-    newMeta.splice(index, 0, item);
+    newMeta.splice.apply(newMeta, [index, 0].concat(_toConsumableArray(items)));
     setMeta(newMeta, groupIndex);
   };
   var delMeta = function delMeta(meta, groupIndex) {
@@ -810,7 +844,13 @@ var useStore = function useStore() {
     setFetchDiffFn: setFetchDiffFn,
     getModuleDiffCode: getModuleDiffCode,
     isSubquery: isSubquery,
-    setIsSubquery: setIsSubquery
+    setIsSubquery: setIsSubquery,
+    moduleCopy: moduleCopy,
+    setModuleCopy: setModuleCopy,
+    metabaseCopyModule: metabaseCopyModule,
+    setMetabaseCopyModule: setMetabaseCopyModule,
+    isMetabaseCopy: isMetabaseCopy,
+    setIsMetabaseCopy: setIsMetabaseCopy
   };
 };
 export default useStore;

package/lib/es/index.js

@@ -66,7 +66,9 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     _props$metabaseCopy = props.metabaseCopy,
     metabaseCopy = _props$metabaseCopy === void 0 ? false : _props$metabaseCopy,
     _props$moduleDiff = props.moduleDiff,
-    moduleDiff = _props$moduleDiff === void 0 ? false : _props$moduleDiff;
+    moduleDiff = _props$moduleDiff === void 0 ? false : _props$moduleDiff,
+    _props$moduleCopy = props.moduleCopy,
+    moduleCopy = _props$moduleCopy === void 0 ? false : _props$moduleCopy;
   var store = useData();
   useEffect(function () {
     getTables && store.setFetchDatasetFn(getTables);
@@ -107,7 +109,8 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     store.setMetabaseCopy(metabaseCopy);
     store.setModuleDiff(moduleDiff);
     store.setIsSubquery(isSubquery);
-  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType, isExit, tableEnableAlias, fieldEnableAlias, groupByEnableAlias, isSelectFields, tableFlat, copyType, metabaseCopy, moduleDiff, isSubquery]);
+    store.setModuleCopy(moduleCopy);
+  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType, isExit, tableEnableAlias, fieldEnableAlias, groupByEnableAlias, isSelectFields, tableFlat, copyType, metabaseCopy, moduleDiff, isSubquery, moduleCopy]);
   React.useImperativeHandle(ref, function () {
     return {
       // setDatasource: (list) => {

package/lib/es/locale/en.js

@@ -169,7 +169,9 @@ export default register('en', {
   'metabase.copySuccess': 'Copy success',
   'metabase.pasteSuccess': 'Paste success',
   'metabase.paste': 'Paste',
-  'customColumn.closeCopy': 'Close Copy',
-  'customColumn.openCopy': 'Open Copy',
-  'customColumn.copyAll': 'Copy All'
+  'customColumn.closeCopy': 'Close Select',
+  'customColumn.openCopy': 'Open Select',
+  'customColumn.copyAll': 'Copy All',
+  'customColumn.delSelect': 'Delete Selected',
+  'customColumn.confirmDelete': 'Confirm delete selected?'
 });

package/lib/es/locale/zh.js

@@ -169,7 +169,9 @@ export default register('zh', {
   'metabase.copySuccess': '复制成功',
   'metabase.pasteSuccess': '粘贴成功',
   'metabase.paste': '粘贴',
-  'customColumn.closeCopy': '关闭复制',
-  'customColumn.openCopy': '开启复制',
-  'customColumn.copyAll': '复制全部'
+  'customColumn.closeCopy': '关闭勾选',
+  'customColumn.openCopy': '开启勾选',
+  'customColumn.copyAll': '复制全部',
+  'customColumn.delSelect': '删除选中',
+  'customColumn.confirmDelete': '确认删除选中？'
 });

package/lib/es/types.d.ts

@@ -51,6 +51,7 @@ export interface MetabaseProps {
     copyType?: (FormulaTypeEnum | string)[];
     metabaseCopy?: boolean;
     moduleDiff?: boolean;
+    moduleCopy?: boolean;
     getModuleDiffCode?: (obj: {
         oldCode: MetaListType;
         newCode: MetaListType;

package/lib/es/utils/storage.d.ts

@@ -11,6 +11,7 @@ interface StorageType {
     theme?: string;
     _metabaseCopy?: any[];
     _metabaseCopyItems?: any[];
+    _metabaseCopyModule?: any[];
 }
 /**
  * 便捷操作 localStorage & sessionStorage

package/lib/es/utils/storage.js

@@ -37,7 +37,8 @@ export var Cache = /*#__PURE__*/function () {
 var storageMap = {
   theme: new Cache(Local, THEME),
   _metabaseCopy: new Cache(Local, '_metabaseCopy'),
-  _metabaseCopyItems: new Cache(Local, '_metabaseCopyItems')
+  _metabaseCopyItems: new Cache(Local, '_metabaseCopyItems'),
+  _metabaseCopyModule: new Cache(Local, '_metabaseCopyModule')
 };
 function observer(obj, key) {
   Object.defineProperty(obj, key, {

package/lib/es/utils.d.ts

@@ -12,6 +12,8 @@ interface HelperResultType {
     nextTypes: TypeEnum[];
     prevList: MetaListType[];
     nextList: MetaListType[];
+    prevItem: MetaListType;
+    nextItem: MetaListType;
     prevGroupBy: MetaSummarize | undefined;
     nextGroupBy: MetaSummarize | undefined;
     prevTables: {
@@ -30,4 +32,8 @@ export declare const buildSqlQuery: (data: MetaListType[] | undefined, type: str
 export declare const isError: (item: AtomsItem | AtomsItem[], data: DataType[]) => 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;
+export declare const isCanPaste: (item: MetaListType | MetaListType[], options: {
+    nextTypes: string[];
+}) => boolean;
 export {};

package/lib/es/utils.js

@@ -62,6 +62,10 @@ export var getHelper = function getHelper(list, item) {
   var leftList = list.slice(0, curIndex);
   var rightList = list.slice(curIndex + 1);
   var topList = leftList; // 包含自己
+  // let prevType = list[curIndex - 1]?.type || '';
+  // let nextType = list[curIndex + 1]?.type || '';
+  var prevItem = list[curIndex - 1] || {};
+  var nextItem = list[curIndex + 1] || {};
   var ExistAboveGroupBy = false;
   var ExistBelowGroupBy = false;
   var prevTypes = [];
@@ -96,7 +100,9 @@ export var getHelper = function getHelper(list, item) {
     nextList: nextList,
     prevGroupBy: prevGroupBy,
     nextGroupBy: nextGroupBy,
-    prevTables: prevTables
+    prevTables: prevTables,
+    prevItem: prevItem,
+    nextItem: nextItem
   };
 };
 // 获取子查询的字段
@@ -887,4 +893,18 @@ export var changeExistsCopyField = function changeExistsCopyField(list, data) {
     }
     return _objectSpread({}, v);
   })) || [];
+};
+export var metaIsCheck = function metaIsCheck(data, item) {
+  return (data === null || data === void 0 ? void 0 : data.filter(function (v) {
+    return v.metaKey == item.metaKey;
+  }).length) > 0;
+};
+export var isCanPaste = function isCanPaste(item, options) {
+  if (Array.isArray(item)) {
+    return item.every(function (v) {
+      return options.nextTypes.includes(v.type);
+    });
+  }
+  var type = item.type;
+  return options.nextTypes.includes(type);
 };

package/package.json

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