@gingkoo/pandora-metabase 1.0.81 → 1.0.83

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;
@@ -128,46 +129,62 @@ var useStore = function useStore() {
     _useState38 = _slicedToArray(_useState37, 2),
     isExit = _useState38[0],
     setIsExit = _useState38[1]; // 是否是notExit
-  var _useState39 = useState(true),
+  var _useState39 = useState(false),
     _useState40 = _slicedToArray(_useState39, 2),
-    tableEnableAlias = _useState40[0],
-    setTableEnableAlias = _useState40[1]; // 表名是否开启别名
+    isSubquery = _useState40[0],
+    setIsSubquery = _useState40[1]; // 是否是子查询
   var _useState41 = useState(true),
     _useState42 = _slicedToArray(_useState41, 2),
-    fieldEnableAlias = _useState42[0],
-    setFieldEnableAlias = _useState42[1]; // 字段名是否开启别名
+    tableEnableAlias = _useState42[0],
+    setTableEnableAlias = _useState42[1]; // 表名是否开启别名
   var _useState43 = useState(true),
     _useState44 = _slicedToArray(_useState43, 2),
-    groupByEnableAlias = _useState44[0],
-    setGroupByEnableAlias = _useState44[1]; // 聚合是否开启别名
+    fieldEnableAlias = _useState44[0],
+    setFieldEnableAlias = _useState44[1]; // 字段名是否开启别名
   var _useState45 = useState(true),
     _useState46 = _slicedToArray(_useState45, 2),
-    isSelectFields = _useState46[0],
-    setIsSelectFields = _useState46[1]; // 是否默认勾选字段
-  var _useState47 = useState(false),
+    groupByEnableAlias = _useState46[0],
+    setGroupByEnableAlias = _useState46[1]; // 聚合是否开启别名
+  var _useState47 = useState(true),
     _useState48 = _slicedToArray(_useState47, 2),
-    tableFlat = _useState48[0],
-    setTableFlat = _useState48[1]; // 是否平铺数据表
-  var _useState49 = useState([]),
+    isSelectFields = _useState48[0],
+    setIsSelectFields = _useState48[1]; // 是否默认勾选字段
+  var _useState49 = useState(false),
     _useState50 = _slicedToArray(_useState49, 2),
-    sourceTable = _useState50[0],
-    setSourceTable = _useState50[1];
+    tableFlat = _useState50[0],
+    setTableFlat = _useState50[1]; // 是否平铺数据表
   var _useState51 = useState([]),
     _useState52 = _slicedToArray(_useState51, 2),
-    copyType = _useState52[0],
-    setCopyType = _useState52[1]; // 复制类型
-  var _useState53 = useState(false),
+    sourceTable = _useState52[0],
+    setSourceTable = _useState52[1];
+  var _useState53 = useState([]),
     _useState54 = _slicedToArray(_useState53, 2),
-    metabaseCopy = _useState54[0],
-    setMetabaseCopy = _useState54[1]; // 是否开启复制功能
+    copyType = _useState54[0],
+    setCopyType = _useState54[1]; // 复制类型
   var _useState55 = useState(false),
     _useState56 = _slicedToArray(_useState55, 2),
-    moduleDiff = _useState56[0],
-    setModuleDiff = _useState56[1]; // 是否开启模块比对功能
-  var _useState57 = useState([]),
+    metabaseCopy = _useState56[0],
+    setMetabaseCopy = _useState56[1]; // 是否开启复制功能
+  var _useState57 = useState(false),
     _useState58 = _slicedToArray(_useState57, 2),
-    sourceData = _useState58[0],
-    setSourceData = _useState58[1]; // 原始数据
+    moduleDiff = _useState58[0],
+    setModuleDiff = _useState58[1]; // 是否开启模块比对功能
+  var _useState59 = useState([]),
+    _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>>(
@@ -351,6 +368,7 @@ var useStore = function useStore() {
       var oldColumns,
         callback,
         isSelect,
+        _isSubquery,
         oldObj,
         selectId,
         _table$alias,
@@ -369,6 +387,7 @@ var useStore = function useStore() {
             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;
             // 获取之前选中的数据
             oldObj = {};
             selectId = oldColumns.filter(function (v) {
@@ -379,6 +398,10 @@ var useStore = function useStore() {
             }).filter(function (v) {
               return v;
             });
+            if (_isSubquery) {
+              selectId = [];
+              isSelect = false;
+            }
             _table$alias = table.alias, alias = _table$alias === void 0 ? '' : _table$alias, datasourceName = table.datasourceName, did = table.datasourceId, column = table.column, extra = _objectWithoutProperties(table, _excluded);
             tableName = table.name;
             columns = getColumns(tableName);
@@ -460,6 +483,7 @@ var useStore = function useStore() {
   }();
   // 回显
   var setPreData = function setPreData(data) {
+    var _isSubquery = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : isSubquery;
     // let patchVersion = (data?.[0]?.list?.[0] as any)?.patchVersion || '';
     if (data.length) {
       var _metaList = data === null || data === void 0 ? void 0 : data.map(function (item, groupIndex) {
@@ -483,7 +507,7 @@ var useStore = function useStore() {
                 newMeta[i].columns = columns || [];
               }
               setMeta(newMeta, groupIndex, 'init', data);
-            }, false);
+            }, false, _isSubquery);
             return _objectSpread({}, v);
           }
           // 设置column
@@ -502,7 +526,7 @@ var useStore = function useStore() {
               //   newMeta[i] = setQuotes(newMeta[i]);
               // }
               setMeta(newMeta, groupIndex, 'init', data);
-            }, false);
+            }, false, _isSubquery);
             return _objectSpread({}, v);
           }
           return _objectSpread({}, v);
@@ -527,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) {
@@ -636,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) {
@@ -797,7 +842,15 @@ var useStore = function useStore() {
     sourceData: sourceData,
     setSourceData: setSourceData,
     setFetchDiffFn: setFetchDiffFn,
-    getModuleDiffCode: getModuleDiffCode
+    getModuleDiffCode: getModuleDiffCode,
+    isSubquery: isSubquery,
+    setIsSubquery: setIsSubquery,
+    moduleCopy: moduleCopy,
+    setModuleCopy: setModuleCopy,
+    metabaseCopyModule: metabaseCopyModule,
+    setMetabaseCopyModule: setMetabaseCopyModule,
+    isMetabaseCopy: isMetabaseCopy,
+    setIsMetabaseCopy: setIsMetabaseCopy
   };
 };
 export default useStore;

package/lib/es/index.js

@@ -50,6 +50,8 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     filterCustomType = _props$filterCustomTy === void 0 ? false : _props$filterCustomTy,
     _props$isExit = props.isExit,
     isExit = _props$isExit === void 0 ? false : _props$isExit,
+    _props$isSubquery = props.isSubquery,
+    isSubquery = _props$isSubquery === void 0 ? false : _props$isSubquery,
     _props$tableEnableAli = props.tableEnableAlias,
     tableEnableAlias = _props$tableEnableAli === void 0 ? true : _props$tableEnableAli,
     _props$fieldEnableAli = props.fieldEnableAlias,
@@ -64,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);
@@ -78,7 +82,7 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
   useEffect(function () {
     var _value = reassembleByUnion(patchData(value));
     var source_value = patchData(value);
-    store.setPreData(cloneDeep(_value));
+    store.setPreData(cloneDeep(_value), isSubquery);
     store.setSourceData(source_value);
   }, [value]);
   useEffect(function () {
@@ -104,7 +108,9 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     store.setCopyType(copyType || []);
     store.setMetabaseCopy(metabaseCopy);
     store.setModuleDiff(moduleDiff);
-  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType, isExit, tableEnableAlias, fieldEnableAlias, groupByEnableAlias, isSelectFields, tableFlat, copyType, metabaseCopy, moduleDiff]);
+    store.setIsSubquery(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

@@ -38,6 +38,7 @@ export interface MetabaseProps {
     notExistsColumns?: DataType[];
     formulaTemplates?: FormulaTemplatesItem[];
     isExit?: boolean;
+    isSubquery?: boolean;
     tableEnableAlias?: boolean;
     fieldEnableAlias?: boolean;
     groupByEnableAlias?: boolean;
@@ -50,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.81",
+  "version": "1.0.83",
   "description": "",
   "main": "lib/es/index.js",
   "module": "lib/es/index.js",