@gingkoo/pandora-metabase 1.0.0-alpha.30 → 1.0.0-alpha.31

package/README.md

@@ -62,6 +62,8 @@ export interface MetaBaseProps {
   subShowSubquery?: boolean; //子查询是否展示子查询
   constantList?: OptionItem[]; //常量下拉框
   notExistsToolbar?: ToolbarType[]; // notExists的功能菜单 默认取toolbar
+  ignoreGroupByType?: boolean; // 忽略groupBy类型
+
 }
 
 export interface OptionItem {

package/lib/es/components/dialog/select-summarize/index.d.ts

@@ -12,6 +12,7 @@ interface PropsType {
     value: ValueType;
     onChange: (reocrd: ValueType) => void;
     didUpdate?: Function;
+    ignoreGroupByType?: boolean;
 }
-declare const SelectSummarize: ({ data, value, onChange, didUpdate }: PropsType) => import("react/jsx-runtime").JSX.Element;
+declare const SelectSummarize: ({ data, value, onChange, didUpdate, ignoreGroupByType }: PropsType) => import("react/jsx-runtime").JSX.Element;
 export default SelectSummarize;

package/lib/es/index.js

@@ -1,12 +1,12 @@
 /**
- * @gingkoo/pandora-metabase v1.0.0-alpha.30
+ * @gingkoo/pandora-metabase v1.0.0-alpha.31
  */
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import * as React from 'react';
 import React__default, { useContext, createContext, useState, useRef, useMemo, useEffect, forwardRef, useImperativeHandle } from 'react';
 import cloneDeep from 'lodash/cloneDeep';
 import cx from 'classnames';
-import { Tooltip, Button, Modal, Input, DatePicker, Dropdown, InputNumber, Select, Modal2, Toast } from '@gingkoo/pandora';
+import { Tooltip, Button, Modal, Input, DatePicker, Dropdown, InputNumber, Select, Toast, Modal2 } from '@gingkoo/pandora';
 import Styled from 'styled-components';
 import { ChevronODown, Repeat, Function, RelatedWork, FfPlus, FfLine } from '@gingkoo/pandora-icons';
 import isEqual from 'lodash/isEqual';
@@ -1224,6 +1224,7 @@ const useStore = () => {
   const [tableNameTpl, setTableNameTpl] = useState('${name}'); //显示字段
   const [sourceList, setSourceList] = useState([]); //数据源列表
   const [constantList, setConstantList] = useState([]); //常量列表
+  const [ignoreGroupByType, setIgnoreGroupByType] = useState(false); // 忽略groupBy类型
   const [_cacheSource2TableMap, set_cacheSource2TableMap] = useState({}); //数据源id 对应数据集列表
   const [_cacheColumnsMap, set_cacheColumnsMap] = useState({}); //数据源id 对应数据集列表
   const [metaList, _setMeta] = useState(defaultMeta); //数据源id 对应数据集列表
@@ -1653,7 +1654,9 @@ const useStore = () => {
     _setShowSubquery,
     constantList,
     setConstantList,
-    popupContainer
+    popupContainer,
+    ignoreGroupByType,
+    setIgnoreGroupByType
   };
 };
 
@@ -1704,6 +1707,7 @@ register('en', {
   'SqlQueryBuilder.visualize': 'visualize',
   'SqlQueryBuilder.selectColumnAll': 'select all',
   'SqlQueryBuilder.alias': 'alias',
+  'SqlQueryBuilder.aliasCannotEmpty': 'Alias cannot be empty',
   'customColumn.operator': 'operator',
   'customColumn.field': 'field',
   'customColumn.constant': 'constant',
@@ -1848,6 +1852,7 @@ register('zh', {
   'SqlQueryBuilder.visualize': '可视化',
   'SqlQueryBuilder.selectColumnAll': '全选',
   'SqlQueryBuilder.alias': '别名',
+  'SqlQueryBuilder.aliasCannotEmpty': '别名不能为空',
   'customColumn.operator': '运算符',
   'customColumn.field': '字段',
   'customColumn.constant': '常量',
@@ -4570,7 +4575,7 @@ const SelectFilterColumn = ({
           },
           format: 'YYYY-MM-DD HH:mm',
           className: 'w_300',
-          value: moment(firstVal ?? undefined),
+          value: firstVal ? moment(firstVal) : '',
           onChange: val => {
             if (val) {
               setVal([moment(val).format('YYYY-MM-DD HH:mm')]);
@@ -4971,7 +4976,8 @@ const SelectSummarize = ({
   data,
   value,
   onChange,
-  didUpdate
+  didUpdate,
+  ignoreGroupByType
 }) => {
   const [condition, setCondition] = useState(value.condition);
   function goPrevPage() {
@@ -4987,7 +4993,7 @@ const SelectSummarize = ({
   }
   if (condition && !~Special.indexOf(condition)) {
     let availableData = data.slice();
-    if (condition !== '不重复值的总数') {
+    if (condition !== '不重复值的总数' && !ignoreGroupByType) {
       // 只能用数字类型做聚合
       availableData = data.map(v => {
         return {
@@ -5731,12 +5737,17 @@ const TableData = props => {
           alias = val;
         }
       }),
-      onOk: () => {
-        let newMetaList = store.metaList[groupIndex].list.slice();
-        // @ts-ignore
-        newMetaList[0].table.alias = alias;
-        newMetaList = changeTableAlias(newMetaList, newMetaList[0].table);
-        store.setMeta(newMetaList, groupIndex);
+      onOk: async () => {
+        if (!alias) {
+          Toast.warning(__('SqlQueryBuilder.aliasCannotEmpty'));
+          return false;
+        } else {
+          let newMetaList = store.metaList[groupIndex].list.slice();
+          // @ts-ignore
+          newMetaList[0].table.alias = alias;
+          newMetaList = changeTableAlias(newMetaList, newMetaList[0].table);
+          store.setMeta(newMetaList, groupIndex);
+        }
       },
       onCancel: () => {}
     });
@@ -5774,7 +5785,7 @@ const TableData = props => {
               newMetaList.subquery = newList;
               newMetaList.table = {
                 ...newList[0].table,
-                alias: newMetaList.table.alias || '',
+                alias: newMetaList.table.alias || newList[0].table.name + '_' + groupIndex + '_' + 0,
                 tableUuid: uuidv4('table')
               };
               const items = getSubColumns(newList);
@@ -6444,7 +6455,8 @@ const JoinData = props => {
               }
               newMeta[index].subquery = newList;
               newMeta[index].table2 = {
-                ...newList[0].table
+                ...newList[0].table,
+                alias: newMeta[index].table2.alias || newList[0].table.name + '_' + groupIndex + '_' + index
               };
               const items = getSubColumns(newList);
               const newColumns = items.flatMap(item => item.columns);
@@ -6502,12 +6514,17 @@ const JoinData = props => {
           alias = val;
         }
       }),
-      onOk: () => {
-        let index = findIndex(store.metaList[groupIndex].list, meta);
-        let newMeta = store.metaList[groupIndex].list.slice();
-        newMeta[index].table2.alias = alias;
-        newMeta = changeTableAlias(newMeta, newMeta[index].table2);
-        store.setMeta(newMeta, groupIndex);
+      onOk: async () => {
+        if (!alias) {
+          Toast.warning(__('SqlQueryBuilder.aliasCannotEmpty'));
+          return false;
+        } else {
+          let index = findIndex(store.metaList[groupIndex].list, meta);
+          let newMeta = store.metaList[groupIndex].list.slice();
+          newMeta[index].table2.alias = alias;
+          newMeta = changeTableAlias(newMeta, newMeta[index].table2);
+          store.setMeta(newMeta, groupIndex);
+        }
       },
       onCancel: () => {}
     });
@@ -8448,6 +8465,7 @@ const SelectIndex = props => {
       content: jsx(SelectSummarize, {
         data: data,
         value: value,
+        ignoreGroupByType: store.ignoreGroupByType,
         onChange: data => {
           //@ts-ignore
           newMeta[index].group.splice(i, 1, data);
@@ -8501,6 +8519,7 @@ const SelectIndex = props => {
       content: jsx(SelectSummarize, {
         data: data,
         value: value,
+        ignoreGroupByType: store.ignoreGroupByType,
         onChange: data => {
           // @ts-ignore
           newMeta[index].group.push(data);
@@ -9186,7 +9205,8 @@ const SqlVisionBuilder = /*#__PURE__*/React__default.forwardRef((props, ref) =>
     showSubquery = true,
     // 是否展示子查询
     subShowSubquery = false,
-    constantList
+    constantList,
+    ignoreGroupByType = false
   } = props;
   const store = useStore();
   useEffect(() => {
@@ -9211,7 +9231,8 @@ const SqlVisionBuilder = /*#__PURE__*/React__default.forwardRef((props, ref) =>
     store.setShowSubquery(showSubquery);
     store._setShowSubquery(subShowSubquery);
     store.setConstantList(constantList || []);
-  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList]);
+    store.setIgnoreGroupByType(ignoreGroupByType);
+  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, ignoreGroupByType]);
   React__default.useImperativeHandle(ref, () => ({
     // setDatasource: (list) => {
     //   store.setSourceList(list);