@gingkoo/pandora-metabase 0.0.14 → 0.0.16

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

@@ -42,5 +42,5 @@ interface PropsType {
     }) => void;
     didUpdate?: Function;
 }
-declare const SelectJoinColumn: ({ data, value, theme, onSelect, isGroup, onGroup, didUpdate, }: PropsType) => import("react/jsx-runtime").JSX.Element;
+declare const SelectJoinColumn: ({ data, value: _value, theme, onSelect, isGroup, onGroup, didUpdate, }: PropsType) => import("react/jsx-runtime").JSX.Element;
 export default SelectJoinColumn;

package/lib/es/index.js

@@ -1,5 +1,5 @@
 /**
- * @gingkoo/pandora-metabase v0.0.14
+ * @gingkoo/pandora-metabase v0.0.16
  */
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import * as React from 'react';
@@ -3658,7 +3658,7 @@ const IconMap = {
 const OPEN_GROUP = false; // mr.chen 说不弄这块 弄个开关防止后面要用
 const SelectJoinColumn = ({
   data: _data = [],
-  value,
+  value: _value,
   theme: _theme = ColumnsPopupThemeEnum.skyBlue,
   onSelect,
   isGroup,
@@ -3666,10 +3666,11 @@ const SelectJoinColumn = ({
   didUpdate
 }) => {
   const store = useStore$1();
-  const [curTable, setCurTable] = useState(value.alias); // 当前选择的表
-  const [curColumn, setCurColumn] = useState(value.name); // 当前选择的字段
+  const [value, setValue] = useState(_value); // 当前选择的字段
+  const [curTable, setCurTable] = useState(_value.alias); // 当前选择的表
+  const [curColumn, setCurColumn] = useState(_value.name); // 当前选择的字段
   const [tableList, setTableList] = useState(_data.map((v, i) => {
-    let open = !i && !curTable ? true : v.alias === curTable; // TODO.这里只判断表名相等 没有用了 因为表上面加了一层数据源 先这样吧
+    let open = !i && !_value.alias ? true : v.alias === _value.alias; // TODO.这里只判断表名相等 没有用了 因为表上面加了一层数据源 先这样吧
     return {
       ...v,
       open,
@@ -3677,6 +3678,22 @@ const SelectJoinColumn = ({
       columns: v.columns.slice()
     };
   }));
+  useEffect(() => {
+    setValue(_value);
+    setCurTable(_value.alias);
+    setCurColumn(_value.name);
+  }, [_value]);
+  useEffect(() => {
+    setTableList(_data.map((v, i) => {
+      let open = !i && !_value.alias ? true : v.alias === _value.alias; // TODO.这里只判断表名相等 没有用了 因为表上面加了一层数据源 先这样吧
+      return {
+        ...v,
+        open,
+        searchText: '',
+        columns: v.columns.slice()
+      };
+    }));
+  }, [_data, _value]);
   useEffect(() => {
     didUpdate?.();
   }, [tableList]);
@@ -5263,19 +5280,20 @@ const JoinData = props => {
     });
   }
   function _getColumns(metaList) {
-    let {
-      ExistAboveGroupBy,
-      prevList,
-      prevGroupBy
-    } = getHelper(metaList, {
+    let obj = {
       metaKey: -1,
       type: TypeEnum.customColumn,
       customColumn: [{
         name: '',
         // 用户起的别名
-        formula: 'string' // 公式}];
+        formula: '' // 公式}];
       }]
-    });
+    };
+    let {
+      ExistAboveGroupBy,
+      prevList,
+      prevGroupBy
+    } = getHelper([...metaList, obj], obj);
     let data;
     if (ExistAboveGroupBy) {
       let _data = {
@@ -5714,6 +5732,7 @@ const JoinData = props => {
     const {
       ref,
       subToolbar,
+      toolbar,
       ...other
     } = store.preProps;
     let newMeta = store.metaList.slice();
@@ -5725,7 +5744,7 @@ const JoinData = props => {
         children: jsx(SqlVisionBuilder, {
           ...other,
           _showSubquery: store.showSubquery,
-          toolbar: subToolbar,
+          toolbar: subToolbar || toolbar,
           btnText: __('SqlQueryBuilder.confirm'),
           value: val,
           onOk: newList => {
@@ -5754,9 +5773,7 @@ const JoinData = props => {
           }
         })
       }),
-      onClose: () => {
-        o.close();
-      }
+      onClose: () => {}
     });
   };
   // 切换子查询
@@ -5833,8 +5850,8 @@ const JoinData = props => {
               disabled: meta.readonly,
               primary: meta.isSubquery,
               ghost: true,
-              className: cx('mr-2 operator-icon subquery-icon', {
-                isSubquery: !meta.isSubquery
+              className: cx('mr-2 operator-icon', {
+                ['subquery-icon']: !meta.isSubquery
               }),
               icon: jsx(RelatedWork, {}),
               onClick: switchSubQuery