@gingkoo/pandora-metabase 1.0.0-alpha.25 → 1.0.0-alpha.26

package/lib/es/index.js

@@ -1,5 +1,5 @@
 /**
- * @gingkoo/pandora-metabase v1.0.0-alpha.25
+ * @gingkoo/pandora-metabase v1.0.0-alpha.26
  */
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import * as React from 'react';
@@ -154,6 +154,36 @@ var EleComponentEnum;
   EleComponentEnum["select"] = "select";
 })(EleComponentEnum || (EleComponentEnum = {}));
 
+//获取指定名称的cookie值
+function getCookie(name) {
+  // (^| )name=([^;]*)(;|$),match[0]为与整个正则表达式匹配的字符串，match[i]为正则表达式捕获数组相匹配的数组；
+  var arr = document.cookie.match(new RegExp('(^| )' + name + '=([^;]*)(;|$)'));
+  if (arr != null) {
+    console.log(arr);
+    return arr[2];
+  }
+  return null;
+}
+
+const locales = {};
+const activeLocale = getCookie('LOCALE') || 'zh';
+const isEn = activeLocale === 'en';
+const register = (name, data) => {
+  if (name in locales) {
+    console.warn(`[i18n] ${name} has been registered`);
+  } else {
+    locales[name] = data;
+  }
+};
+const __ = name => {
+  if (activeLocale in locales) {
+    return locales[activeLocale][name] || '';
+  } else {
+    console.warn(`[i18n] locale not found`);
+    return '';
+  }
+};
+
 // import { SummarizeAlias } from './index';
 const SummarizeAlias$1 = 'source';
 const NUMBER_GROUP$1 = [SQL_COLUMN_TYPE.FLOAT, SQL_COLUMN_TYPE.LONG, SQL_COLUMN_TYPE.CURRENCY];
@@ -649,7 +679,9 @@ const getSubColumns = metaList => {
         return {
           name_zh: v.quotes,
           ...v,
-          name: v.fieldAlias,
+          name: v.fieldAlias || v.name,
+          fieldAlias: '',
+          fieldUuid: uuidv4('field'),
           realName: v.sql?.split(' AS ')?.[1] || '',
           // name_zh: '',
           database_type: v?.database_type || SQL_COLUMN_TYPE.FLOAT,
@@ -663,7 +695,9 @@ const getSubColumns = metaList => {
         return {
           name_zh: v.quotes,
           ...v,
-          name: v.fieldAlias,
+          name: v.fieldAlias || v.name,
+          fieldAlias: '',
+          fieldUuid: uuidv4('field'),
           realName: v.sql?.split(' AS ')?.[1] || '',
           // name_zh: '',
           database_type: v?.database_type || SQL_COLUMN_TYPE.FLOAT,
@@ -680,10 +714,18 @@ const getSubColumns = metaList => {
       data = data.concat(
       // @ts-ignore
       joinData.map(v => {
+        const columns = v.columns.map(column => {
+          return {
+            ...column,
+            name: column.fieldAlias || column.name,
+            fieldAlias: '',
+            fieldUuid: uuidv4('field')
+          };
+        });
         return {
           alias: v.table2.alias,
           table: v.table2.name,
-          columns: v.columns
+          columns: columns
         };
       }));
     }
@@ -691,16 +733,49 @@ const getSubColumns = metaList => {
     // @ts-ignore
     data = metaList.slice().map(v => {
       if (v.type === TypeEnum.data) {
+        const columns = v.columns.map(column => {
+          return {
+            ...column,
+            name: column.fieldAlias || column.name,
+            fieldAlias: '',
+            fieldUuid: uuidv4('field')
+          };
+        });
         return {
           alias: v.table.alias,
           table: v.table.name,
-          columns: v.columns
+          columns: columns
         };
       } else if (v.type === TypeEnum.joinData) {
+        const columns = v.columns.map(column => {
+          return {
+            ...column,
+            name: column.fieldAlias || column.name,
+            fieldAlias: '',
+            fieldUuid: uuidv4('field')
+          };
+        });
         return {
           alias: v.table2.alias,
           table: v.table2.name,
-          columns: v.columns
+          columns: columns
+        };
+      } else if (v.type === TypeEnum.customColumn) {
+        const {
+          customColumn
+        } = v;
+        const columns = customColumn.map(v => {
+          return {
+            name_zh: __('SqlQueryBuilder.customColumn'),
+            name: v.name,
+            fieldAlias: '',
+            fieldUuid: uuidv4('field')
+          };
+        });
+        return {
+          columns: columns,
+          alias: '',
+          table: __('SqlQueryBuilder.customColumn')
         };
       } else {
         return {
@@ -934,6 +1009,9 @@ const changeFieldAlias = (list, curObj) => {
         }
       });
     }
+    return {
+      ...v
+    };
   }) || [];
 };
 function splitByUnion(data) {
@@ -1574,36 +1652,6 @@ const useStore = () => {
   };
 };
 
-//获取指定名称的cookie值
-function getCookie(name) {
-  // (^| )name=([^;]*)(;|$),match[0]为与整个正则表达式匹配的字符串，match[i]为正则表达式捕获数组相匹配的数组；
-  var arr = document.cookie.match(new RegExp('(^| )' + name + '=([^;]*)(;|$)'));
-  if (arr != null) {
-    console.log(arr);
-    return arr[2];
-  }
-  return null;
-}
-
-const locales = {};
-const activeLocale = getCookie('LOCALE') || 'zh';
-const isEn = activeLocale === 'en';
-const register = (name, data) => {
-  if (name in locales) {
-    console.warn(`[i18n] ${name} has been registered`);
-  } else {
-    locales[name] = data;
-  }
-};
-const __ = name => {
-  if (activeLocale in locales) {
-    return locales[activeLocale][name] || '';
-  } else {
-    console.warn(`[i18n] locale not found`);
-    return '';
-  }
-};
-
 register('en', {
   'data.pleaseSelectDataTable': 'please select data table',
   'data.calculatingNow': 'calculating now...',
@@ -2216,13 +2264,13 @@ const LeftJoinIcon = ({
   })
 });
 const InnerJoinIcon = ({
-  width: _width10 = 32,
-  height: _height10 = 32,
+  width: _width0 = 32,
+  height: _height0 = 32,
   style
 }) => jsx("svg", {
   viewBox: '0 0 32 32',
-  width: _width10,
-  height: _height10,
+  width: _width0,
+  height: _height0,
   fill: 'currentcolor',
   role: 'img',
   "aria-label": 'join_inner icon',
@@ -2232,13 +2280,13 @@ const InnerJoinIcon = ({
   })
 });
 const UpArrowIcon = ({
-  width: _width11 = 16,
-  height: _height11 = 17
+  width: _width1 = 16,
+  height: _height1 = 17
 }) => jsx("svg", {
   className: 'sort-arrow',
   viewBox: '0 0 32 34',
-  width: _width11,
-  height: _height11,
+  width: _width1,
+  height: _height1,
   fill: 'currentcolor',
   role: 'img',
   "aria-label": 'arrow_up icon',
@@ -2247,13 +2295,13 @@ const UpArrowIcon = ({
   })
 });
 const DownArrowIcon = ({
-  width: _width12 = 16,
-  height: _height12 = 17
+  width: _width10 = 16,
+  height: _height10 = 17
 }) => jsx("svg", {
   className: 'sort-arrow',
   viewBox: '0 0 32 34',
-  width: _width12,
-  height: _height12,
+  width: _width10,
+  height: _height10,
   fill: 'currentcolor',
   role: 'img',
   "aria-label": 'arrow_down icon',
@@ -2262,13 +2310,13 @@ const DownArrowIcon = ({
   })
 });
 const CloseIcon = ({
-  width: _width13 = 16,
-  height: _height13 = 16
+  width: _width11 = 16,
+  height: _height11 = 16
 }) => jsx("svg", {
   className: 'closeIcon',
   viewBox: '0 0 32 32',
-  width: _width13,
-  height: _height13,
+  width: _width11,
+  height: _height11,
   fill: 'currentcolor',
   role: 'img',
   "aria-label": 'close icon',
@@ -2277,12 +2325,12 @@ const CloseIcon = ({
   })
 });
 const AddIcon = ({
-  width: _width14 = 16,
-  height: _height14 = 16
+  width: _width12 = 16,
+  height: _height12 = 16
 }) => jsx("svg", {
   viewBox: '0 0 32 32',
-  width: _width14,
-  height: _height14,
+  width: _width12,
+  height: _height12,
   fill: 'currentcolor',
   role: 'img',
   "aria-label": 'add icon',
@@ -2291,12 +2339,12 @@ const AddIcon = ({
   })
 });
 const TableIcon = ({
-  width: _width15 = 18,
-  height: _height15 = 18
+  width: _width13 = 18,
+  height: _height13 = 18
 }) => jsx("svg", {
   viewBox: '0 0 32 32',
-  width: _width15,
-  height: _height15,
+  width: _width13,
+  height: _height13,
   fill: 'currentcolor',
   role: 'img',
   "aria-label": 'table2 icon',
@@ -2305,12 +2353,12 @@ const TableIcon = ({
   })
 });
 const SearchIcon = ({
-  width: _width16 = 16,
-  height: _height16 = 16
+  width: _width14 = 16,
+  height: _height14 = 16
 }) => jsx("svg", {
   viewBox: '0 0 32 32',
-  width: _width16,
-  height: _height16,
+  width: _width14,
+  height: _height14,
   fill: 'currentcolor',
   role: 'img',
   "aria-label": 'search icon',
@@ -3695,7 +3743,6 @@ function generateTrigger(PortalComponent) {
           borderRadius: 6
         },
         onClick: e => this.props.closable && e.stopPropagation(),
-        onMouseDown: e => e.stopPropagation(),
         children: /*#__PURE__*/React.cloneElement(this.props.children, {
           key: posKey,
           didUpdate: this.didUpdate
@@ -3825,10 +3872,14 @@ const SelectColumn = ({
         newMetaList = changeFieldAlias(newMetaList, newColumns[i]);
         store.setMeta(newMetaList, groupIndex);
         onSelect(newColumns);
-        store.setClosable(true);
+        setTimeout(() => {
+          store.setClosable(true);
+        }, 0);
       },
       onCancel: () => {
-        store.setClosable(true);
+        setTimeout(() => {
+          store.setClosable(true);
+        }, 0);
       }
     });
   };
@@ -3928,10 +3979,10 @@ const SelectJoinColumn = ({
 }) => {
   const store = useStore$1();
   const [value, setValue] = useState(_value); // 当前选择的字段
-  const [curTable, setCurTable] = useState(_value.alias); // 当前选择的表
+  const [curTable, setCurTable] = useState(_value.tableUuid); // 当前选择的表
   const [curColumn, setCurColumn] = useState(_value.name); // 当前选择的字段
   const [tableList, setTableList] = useState(_data.map((v, i) => {
-    let open = !i && !_value.alias ? true : v.alias === _value.alias; // TODO.这里只判断表名相等 没有用了 因为表上面加了一层数据源 先这样吧
+    let open = !i && !_value.tableUuid ? true : v.tableUuid === _value.tableUuid; // TODO.这里只判断表名相等 没有用了 因为表上面加了一层数据源 先这样吧
     return {
       ...v,
       open,
@@ -3941,12 +3992,12 @@ const SelectJoinColumn = ({
   }));
   useEffect(() => {
     setValue(_value);
-    setCurTable(_value.alias);
+    setCurTable(_value.tableUuid);
     setCurColumn(_value.name);
   }, [_value]);
   useEffect(() => {
     setTableList(_data.map((v, i) => {
-      let open = !i && !_value.alias ? true : v.alias === _value.alias; // TODO.这里只判断表名相等 没有用了 因为表上面加了一层数据源 先这样吧
+      let open = !i && !_value.tableUuid ? true : v.tableUuid === _value.tableUuid; // TODO.这里只判断表名相等 没有用了 因为表上面加了一层数据源 先这样吧
       return {
         ...v,
         open,
@@ -4006,12 +4057,12 @@ const SelectJoinColumn = ({
                 if (open) {
                   setTableList(newTables.map(v => ({
                     ...v,
-                    open: tableAlias === v.alias ? false : v.open
+                    open: tableUuid === v.tableUuid ? false : v.open
                   })));
                 } else {
                   setTableList(newTables.map(v => ({
                     ...v,
-                    open: tableAlias === v.alias || v.alias === SummarizeAlias$1
+                    open: tableUuid === v.tableUuid || v.alias === SummarizeAlias$1
                   })));
                 }
               },
@@ -5714,7 +5765,9 @@ const TableData = props => {
               }
               newMetaList.subquery = newList;
               newMetaList.table = {
-                ...newList[0].table
+                ...newList[0].table,
+                alias: '',
+                tableUuid: uuidv4('table')
               };
               const items = getSubColumns(newList);
               const newColumns = items.flatMap(item => item.columns);
@@ -6383,14 +6436,14 @@ const JoinData = props => {
               }
               newMeta[index].subquery = newList;
               newMeta[index].table2 = {
-                ...newList[0].table,
-                fieldAlias: '',
-                fieldUuid: ''
+                ...newList[0].table
               };
               const items = getSubColumns(newList);
               const newColumns = items.flatMap(item => item.columns);
               newMeta[index].columns = newColumns;
               newMeta[index].expressions = [];
+              // 关联表变了 下面模块全部删除
+              newMeta = newMeta.filter((v, i) => i <= index);
               store.setMeta(newMeta, groupIndex);
               o.close();
             } catch (e) {
@@ -7682,7 +7735,7 @@ const Filter = props => {
       showNotExists(i, '');
       return;
     }
-    let data = [...getColumns(), ...cloneDeep(notExistsColumns)];
+    let data = [...getColumns(), ...cloneDeep(notExistsColumns || [])];
     store.setPopup({
       visible: true,
       node: e.currentTarget,
@@ -7700,8 +7753,8 @@ const Filter = props => {
   function handleAdd(e) {
     let node = e.currentTarget;
     let newMeta = store.metaList[groupIndex].list.slice();
-    let data = getColumns();
-    let _index = node.getAttribute('v-index');
+    let data = [...getColumns(), ...cloneDeep(notExistsColumns || [])];
+    let _index = Number(node.getAttribute('v-index'));
     let _type = node.getAttribute('v-type');
     let value = {
       table: '',
@@ -7737,15 +7790,16 @@ const Filter = props => {
       content: jsx(SelectFilter, {
         data: data,
         value: value,
-        onChange: data => {
+        onChange: val => {
           if (_type) {
             if (_type === 'before') {
-              newMeta[index].filter.splice(_index, 0, data);
+              newMeta[index].filter.splice(_index, 0, val);
             } else {
-              newMeta[index].filter.splice(_index + 1, 0, data);
+              console.log('🚀 ~ ', newMeta[index].filter);
+              newMeta[index].filter.splice(_index + 1, 0, val);
             }
           } else {
-            newMeta[index].filter.push(data);
+            newMeta[index].filter.push(val);
           }
           store.setMeta(newMeta, groupIndex);
           closePopup();