@gingkoo/pandora-metabase 1.0.14 → 1.0.16

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

@@ -3,12 +3,13 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-var _excluded = ["alias", "datasourceName", "datasourceId", "column", "groupSql"];
+var _excluded = ["alias", "datasourceName", "datasourceId", "column"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useState, useRef, useMemo } from 'react';
 import { uuidv4 } from '../utils/helper';
 import { TypeEnum, JoinEnum, UnionEnum } from '../store/enum';
 import { getSubColumns } from '../utils';
+import { joinDataPatch, filterPatch, sortPatch, customColumnPatch } from './patch';
 var metaKey = 1;
 export var SummarizeAlias = 'source';
 var useStore = function useStore() {
@@ -18,6 +19,7 @@ var useStore = function useStore() {
     type: TypeEnum.data,
     table: {
       name: '',
+      name_zh: '',
       id: '',
       alias: '',
       datasourceId: '',
@@ -54,65 +56,65 @@ var useStore = function useStore() {
     toolbar = _useState8[0],
     setToolbar = _useState8[1]; //工具列表
   var _useState9 = useState('${name}'),
-    _useState10 = _slicedToArray(_useState9, 2),
-    fieldNameTpl = _useState10[0],
-    setFieldNameTpl = _useState10[1]; //显示字段
-  var _useState11 = useState('${name}'),
+    _useState0 = _slicedToArray(_useState9, 2),
+    fieldNameTpl = _useState0[0],
+    setFieldNameTpl = _useState0[1]; //显示字段
+  var _useState1 = useState('${name}'),
+    _useState10 = _slicedToArray(_useState1, 2),
+    tableNameTpl = _useState10[0],
+    setTableNameTpl = _useState10[1]; //显示字段
+  var _useState11 = useState([]),
     _useState12 = _slicedToArray(_useState11, 2),
-    tableNameTpl = _useState12[0],
-    setTableNameTpl = _useState12[1]; //显示字段
+    sourceList = _useState12[0],
+    setSourceList = _useState12[1]; //数据源列表
   var _useState13 = useState([]),
     _useState14 = _slicedToArray(_useState13, 2),
-    sourceList = _useState14[0],
-    setSourceList = _useState14[1]; //数据源列表
-  var _useState15 = useState([]),
+    constantList = _useState14[0],
+    setConstantList = _useState14[1]; //常量列表
+  var _useState15 = useState(false),
     _useState16 = _slicedToArray(_useState15, 2),
-    constantList = _useState16[0],
-    setConstantList = _useState16[1]; //常量列表
+    ignoreGroupByType = _useState16[0],
+    setIgnoreGroupByType = _useState16[1]; // 忽略groupBy类型
   var _useState17 = useState(false),
     _useState18 = _slicedToArray(_useState17, 2),
-    ignoreGroupByType = _useState18[0],
-    setIgnoreGroupByType = _useState18[1]; // 忽略groupBy类型
-  var _useState19 = useState(false),
+    filterCustomType = _useState18[0],
+    setfilterCustomType = _useState18[1]; // 过滤器自定义类型
+  var _useState19 = useState({}),
     _useState20 = _slicedToArray(_useState19, 2),
-    filterCustomType = _useState20[0],
-    setfilterCustomType = _useState20[1]; // 过滤器自定义类型
+    _cacheSource2TableMap = _useState20[0],
+    set_cacheSource2TableMap = _useState20[1]; //数据源id 对应数据集列表
   var _useState21 = useState({}),
     _useState22 = _slicedToArray(_useState21, 2),
-    _cacheSource2TableMap = _useState22[0],
-    set_cacheSource2TableMap = _useState22[1]; //数据源id 对应数据集列表
-  var _useState23 = useState({}),
+    _cacheColumnsMap = _useState22[0],
+    set_cacheColumnsMap = _useState22[1]; //数据源id 对应数据集列表
+  var _useState23 = useState(defaultMeta),
     _useState24 = _slicedToArray(_useState23, 2),
-    _cacheColumnsMap = _useState24[0],
-    set_cacheColumnsMap = _useState24[1]; //数据源id 对应数据集列表
-  var _useState25 = useState(defaultMeta),
-    _useState26 = _slicedToArray(_useState25, 2),
-    metaList = _useState26[0],
-    _setMeta = _useState26[1]; //数据源id 对应数据集列表
-  var _useState27 = useState({
+    metaList = _useState24[0],
+    _setMeta = _useState24[1]; //数据源id 对应数据集列表
+  var _useState25 = useState({
       visible: false,
       node: null,
       content: null
     }),
-    _useState28 = _slicedToArray(_useState27, 2),
-    popupData = _useState28[0],
-    setPopup = _useState28[1]; //弹窗
-  var _useState29 = useState({
+    _useState26 = _slicedToArray(_useState25, 2),
+    popupData = _useState26[0],
+    setPopup = _useState26[1]; //弹窗
+  var _useState27 = useState({
       visible: false,
       node: null,
       content: null
     }),
+    _useState28 = _slicedToArray(_useState27, 2),
+    popupData2 = _useState28[0],
+    setPopup2 = _useState28[1]; //弹窗
+  var _useState29 = useState(true),
     _useState30 = _slicedToArray(_useState29, 2),
-    popupData2 = _useState30[0],
-    setPopup2 = _useState30[1]; //弹窗
+    popupClosable = _useState30[0],
+    setClosable = _useState30[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
   var _useState31 = useState(true),
     _useState32 = _slicedToArray(_useState31, 2),
-    popupClosable = _useState32[0],
-    setClosable = _useState32[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
-  var _useState33 = useState(true),
-    _useState34 = _slicedToArray(_useState33, 2),
-    popupClosable2 = _useState34[0],
-    setClosable2 = _useState34[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
+    popupClosable2 = _useState32[0],
+    setClosable2 = _useState32[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
   // 外层ref
   var popupContainer = useRef();
   // const [fetchDatasetFn, setFetchDatasetFn] = useState<(id: string) => Promise<any>>(
@@ -165,23 +167,23 @@ var useStore = function useStore() {
   var fetchDataset = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(datasourceId) {
       var tables, _tables;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
+      return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             tables = getDataset(datasourceId);
             if (!tables.length) {
-              _context.next = 3;
+              _context.next = 1;
               break;
             }
             return _context.abrupt("return", tables);
-          case 3:
-            _context.next = 5;
+          case 1:
+            _context.next = 2;
             return fetchDatasetFn.current(datasourceId);
-          case 5:
+          case 2:
             _tables = _context.sent;
             setDataset(datasourceId, _tables);
             return _context.abrupt("return", _tables);
-          case 8:
+          case 3:
           case "end":
             return _context.stop();
         }
@@ -197,30 +199,30 @@ var useStore = function useStore() {
   var fetchColumns = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(table, datasourceId, callback) {
       var _columns2;
-      var _table$alias, alias, datasourceName, did, column, groupSql, extra, tableName, columns, _columns;
-      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      var _table$alias, alias, datasourceName, did, column, extra, tableName, columns, _columns;
+      return _regeneratorRuntime.wrap(function (_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            _table$alias = table.alias, alias = _table$alias === void 0 ? '' : _table$alias, datasourceName = table.datasourceName, did = table.datasourceId, column = table.column, groupSql = table.groupSql, extra = _objectWithoutProperties(table, _excluded);
+            _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);
             if (columns.length) {
-              _context2.next = 8;
+              _context2.next = 2;
               break;
             }
-            _context2.next = 6;
+            _context2.next = 1;
             return fetchColumnsFn.current(extra, datasourceId);
-          case 6:
+          case 1:
             columns = _context2.sent;
             setColumns(tableName, columns);
-          case 8:
+          case 2:
             _columns = (_columns2 = columns) === null || _columns2 === void 0 ? void 0 : _columns2.map(function (v) {
               return _objectSpread(_objectSpread({}, v), {}, {
                 fieldUuid: v.fieldAlias || uuidv4('field')
               });
             });
             typeof callback === 'function' && callback(_columns);
-          case 10:
+          case 3:
           case "end":
             return _context2.stop();
         }
@@ -236,86 +238,6 @@ var useStore = function useStore() {
     _setMeta(newMeta);
   };
   // 回显
-  // 设置column
-  var setQuotes = function setQuotes(newMeta) {
-    var _newMeta$expressions;
-    var fields1 = newMeta.table1.fields || [];
-    var fields2 = newMeta.table2.fields || [];
-    // 处理老字段
-    var field1 = {
-      fieldAlias: newMeta.table1.fieldAlias || newMeta.table1.column,
-      fieldUuid: newMeta.table1.fieldUuid || uuidv4('field'),
-      fieldId: newMeta.table1.id,
-      quotes: newMeta.table1.quotes || newMeta.table1.column
-    };
-    var field2 = {
-      fieldAlias: newMeta.table2.fieldAlias || newMeta.table2.column,
-      fieldUuid: newMeta.table2.fieldUuid || uuidv4('field'),
-      fieldId: newMeta.table2.id,
-      quotes: newMeta.table2.quotes || newMeta.table2.column
-    };
-    // 处理多选
-    if (field1.fieldAlias && fields1.length < 1) {
-      fields1 = [{
-        quotes: field1.quotes,
-        fieldUuid: field1.fieldUuid,
-        fieldAlias: field1.fieldAlias,
-        fieldId: field1.fieldId
-      }];
-    }
-    if (field2.fieldAlias && fields2.length < 1) {
-      fields2 = [{
-        quotes: field2.quotes,
-        fieldUuid: field2.fieldUuid,
-        fieldAlias: field2.fieldAlias,
-        fieldId: field2.fieldId
-      }];
-    }
-    newMeta.table1 = _objectSpread(_objectSpread(_objectSpread({}, newMeta.table1), field1), {}, {
-      tableUuid: newMeta.table1.tableUuid || uuidv4('table'),
-      fields: fields1
-    });
-    newMeta.table2 = _objectSpread(_objectSpread(_objectSpread({}, newMeta.table2), field2), {}, {
-      tableUuid: newMeta.table2.tableUuid || uuidv4('table'),
-      fields: fields2
-    });
-    newMeta.expressions = (_newMeta$expressions = newMeta.expressions) === null || _newMeta$expressions === void 0 ? void 0 : _newMeta$expressions.map(function (v) {
-      var left_fields = v.left_fields || [];
-      var right_fields = v.right_fields || [];
-      // 先处理老数据的字段
-      var left_field = {
-        left_fieldAlias: v.left_fieldAlias || v.left_column,
-        left_fieldUuid: v.left_fieldUuid || uuidv4('field'),
-        left_quotes: v.left_quotes || v.left_column
-      };
-      var right_field = {
-        right_fieldAlias: v.right_fieldAlias || v.right_column,
-        right_fieldUuid: v.right_fieldUuid || uuidv4('field'),
-        right_quotes: v.right_quotes || v.right_column
-      };
-      // 再处理多选
-      if (left_field.left_fieldAlias && left_fields.length < 1) {
-        left_fields = [{
-          fieldAlias: left_field.left_fieldAlias,
-          fieldUuid: left_field.left_fieldUuid,
-          quotes: left_field.left_quotes
-        }];
-      }
-      if (right_field.right_fieldAlias && right_fields.length < 1) {
-        right_fields = [{
-          fieldAlias: right_field.right_fieldAlias,
-          fieldUuid: right_field.right_fieldUuid,
-          quotes: right_field.right_quotes
-        }];
-      }
-      return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, v), left_field), {}, {
-        left_fields: left_fields
-      }, right_field), {}, {
-        right_fields: right_fields
-      });
-    });
-    return newMeta;
-  };
   var setFilterQuotes = function setFilterQuotes(newMeta) {
     newMeta.filter = newMeta.filter.map(function (v) {
       if (!v.expression) {
@@ -340,7 +262,16 @@ var useStore = function useStore() {
             v.table.tableUuid = v.table.tableUuid || uuidv4('table');
           }
           if (v.type === TypeEnum.joinData) {
-            newMeta[i] = setQuotes(newMeta[i]);
+            newMeta[i] = joinDataPatch(newMeta[i]);
+          }
+          if (v.type === TypeEnum.filter) {
+            v = filterPatch(v);
+          }
+          if (v.type === TypeEnum.sort) {
+            newMeta[i] = sortPatch(newMeta[i]);
+          }
+          if (v.type === TypeEnum.customColumn) {
+            newMeta[i] = customColumnPatch(newMeta[i]);
           }
           // if (v.type === TypeEnum.filter) {
           //   newMeta[i] = setFilterQuotes(newMeta[i]);
@@ -415,6 +346,7 @@ var useStore = function useStore() {
       var table1 = {
         id: '',
         name: '',
+        name_zh: '',
         alias: '',
         tableUuid: '',
         datasourceId: '',
@@ -427,6 +359,7 @@ var useStore = function useStore() {
         table1 = _objectSpread(_objectSpread({}, mainTable.table), {}, {
           name: mainTable.table.name,
           alias: mainTable.table.alias,
+          name_zh: mainTable.table.name_zh,
           datasourceId: mainTable.table.datasourceId,
           datasourceName: mainTable.table.datasourceName,
           fieldAlias: '',
@@ -441,14 +374,15 @@ var useStore = function useStore() {
         table1: table1,
         table2: {
           name: '',
+          name_zh: '',
           id: '',
           alias: '',
           tableUuid: '',
           datasourceId: '',
-          datasourceName: '',
-          fieldAlias: '',
-          fieldUuid: '',
-          fields: []
+          datasourceName: ''
+          // fieldAlias: '',
+          // fieldUuid: '',
+          // fields: [],
         },
         columns: [],
         expressions: []
@@ -498,6 +432,7 @@ var useStore = function useStore() {
         type: TypeEnum.permissionTable,
         table: {
           name: '',
+          name_zh: '',
           id: '',
           alias: '',
           tableUuid: '',

package/lib/es/index.d.ts

@@ -1,5 +1,4 @@
 import React from 'react';
-export { restoreStructure, handleSqlStruct, compressionStructure } from './store/helper';
 import './locale/en';
 import './locale/zh';
 import type { MetabaseProps, SqlVisionBuilderRef, DatasourceType } from './types';

package/lib/es/index.js

@@ -3,7 +3,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import React, { useEffect } from 'react';
 import { Provider } from './hooks/use-provider';
 import useData from './hooks/use-state';
-export { restoreStructure, handleSqlStruct, compressionStructure } from './store/helper';
+// export { restoreStructure, handleSqlStruct, compressionStructure } from './store/helper';
 import './locale/en';
 import './locale/zh';
 import { __ } from './locale';

package/lib/es/locale/en.js

@@ -34,6 +34,7 @@ export default register('en', {
   'SqlQueryBuilder.pickTable': 'Select data table...',
   'SqlQueryBuilder.pickConstant': 'Select constant...',
   'SqlQueryBuilder.input': 'Input',
+  'SqlQueryBuilder.numberInput': 'Number Input',
   'SqlQueryBuilder.switchSubQuery': 'Open subquery',
   'SqlQueryBuilder.setSubQuery': 'Set Subquery...',
   'SqlQueryBuilder.subquery': 'Subquery',
@@ -51,7 +52,7 @@ export default register('en', {
   'customColumn.field': 'field',
   'customColumn.constant': 'constant',
   'customColumn.str': 'string',
-  'customColumn.other': 'other',
+  'customColumn.operatorMore': 'operator more',
   'customColumn.update': 'update',
   'customColumn.complete': 'complete',
   'customColumn.fieldFormula': 'field formula',
@@ -103,6 +104,10 @@ export default register('en', {
   'joinData.automaticGrouping': 'automatic grouping',
   'joinData.byTheHour': '[[timestamp]]by the hour',
   'joinData.search': 'search...',
+  'joinData.selectExpression': 'select expression',
+  'joinData.default': 'default',
+  'joinData.expression': 'expression',
+  'joinData.operator': 'operator',
   'summarize.basicIndicators': 'basic indicators',
   'summarize.selectTheColumnsForGrouping': 'select columns for grouping',
   'summarize.selectTheMetricsYouWantToView': 'select the metrics you want to view',
@@ -145,5 +150,7 @@ export default register('en', {
   'result.inProgress': 'in progress',
   'result.yourResultsWillAppearHere': 'your results will appear here',
   'result.queryResult': 'query result',
-  'result.fieldOperations': 'field operations'
+  'result.fieldOperations': 'field operations',
+  'metabase.nextBtn': 'next step',
+  'metabase.nextOk': 'ok'
 });

package/lib/es/locale/zh.js

@@ -34,6 +34,7 @@ export default register('zh', {
   'SqlQueryBuilder.pickTable': '选择数据表...',
   'SqlQueryBuilder.pickConstant': '选择常量...',
   'SqlQueryBuilder.input': '输入框',
+  'SqlQueryBuilder.numberInput': '数字输入框',
   'SqlQueryBuilder.switchSubQuery': '切换子查询',
   'SqlQueryBuilder.setSubQuery': '设置子查询...',
   'SqlQueryBuilder.subquery': '子查询',
@@ -47,11 +48,11 @@ export default register('zh', {
   'SqlQueryBuilder.selectColumnAll': '全选',
   'SqlQueryBuilder.alias': '别名',
   'SqlQueryBuilder.aliasCannotEmpty': '别名不能为空',
-  'customColumn.operator': '运算符',
+  'customColumn.operator': '操作符',
   'customColumn.field': '字段',
   'customColumn.constant': '常量',
   'customColumn.str': '字符串',
-  'customColumn.other': '其他',
+  'customColumn.operatorMore': '更多连接符',
   'customColumn.update': '更新',
   'customColumn.complete': '完成',
   'customColumn.fieldFormula': '字段公式',
@@ -60,7 +61,7 @@ export default register('zh', {
   'customColumn.somethingAwesomeToDocument': '一些超棒的、值得记录的东西',
   'customColumn.expression': '表达式',
   'customColumn.selectField': '选择列',
-  'customColumn.selectOperator': '选择运算符',
+  'customColumn.selectOperator': '选择操作符',
   'customColumn.selectExpression': '选择表达式',
   'customColumn.selectOtherSyntax': '选择其他语法',
   'customColumn.selectCustomInput': '选择自定义输入框',
@@ -103,6 +104,10 @@ export default register('zh', {
   'joinData.automaticGrouping': '自动分组',
   'joinData.byTheHour': '[[时间戳]]按小时计数',
   'joinData.search': '查找...',
+  'joinData.selectExpression': '选择表达式',
+  'joinData.default': '常规',
+  'joinData.expression': '表达式',
+  'joinData.operator': '连接符',
   'summarize.basicIndicators': '基础指标',
   'summarize.selectTheColumnsForGrouping': '选择分组的列',
   'summarize.selectTheMetricsYouWantToView': '选择你要查看的指标',
@@ -145,5 +150,7 @@ export default register('zh', {
   'result.inProgress': '执行中',
   'result.yourResultsWillAppearHere': '您的结果将会在这出现',
   'result.queryResult': '查询结果',
-  'result.fieldOperations': '字段操作'
+  'result.fieldOperations': '字段操作',
+  'metabase.nextBtn': '下一步',
+  'metabase.nextOk': '确定'
 });

package/lib/es/store/helper.d.ts

@@ -1,10 +1,9 @@
-import { MetaListType, MetaFilter_Item, MetaSummarize_Group, ParamsStruct } from './types';
+import { MetaListType, MetaSummarize_Group, AtomsTypeEnum, AtomsItem } from './types';
 export declare const SummarizeAlias = "source";
-export declare const filterToSql: (record: MetaFilter_Item) => string;
 export declare const summarizeToSql: (arr: MetaSummarize_Group[], record: MetaSummarize_Group) => {
     sql: string;
     fieldAlias: string;
 };
-export declare const handleSqlStruct: (list: MetaListType[]) => ParamsStruct;
 export declare const compressionStructure: (data: MetaListType[]) => string;
 export declare const restoreStructure: (data: string) => MetaListType[];
+export declare const getTemItem: (type: AtomsTypeEnum) => AtomsItem;