@gingkoo/pandora-metabase 1.0.0-alpha.6 → 1.0.0-alpha.7

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

@@ -10,6 +10,7 @@ interface PropsType {
     onChange: (reocrd: MetaFilter_Item) => void;
     didUpdate?: Function;
     isCustom?: boolean;
+    container?: any;
 }
 declare const _default: (props: PropsType) => import("react/jsx-runtime").JSX.Element;
 export default _default;

package/lib/es/index.js

@@ -1,5 +1,5 @@
 /**
- * @gingkoo/pandora-metabase v1.0.0-alpha.6
+ * @gingkoo/pandora-metabase v1.0.0-alpha.7
  */
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import * as React from 'react';
@@ -3962,7 +3962,8 @@ const SelectFilterColumn = ({
   value,
   onChange,
   didUpdate,
-  isCustom: _isCustom = false
+  isCustom: _isCustom = false,
+  container: _container = null
 }) => {
   const [curColumn, setCurColumn] = useState(value);
   const [condition, setCondition] = useState(value.condition);
@@ -4379,6 +4380,7 @@ const SelectFilterColumn = ({
     store.setPopup2({
       visible: true,
       node: e.currentTarget,
+      container: _container,
       content: jsx(SelectList, {
         value: valType,
         list: store.constantList || [],
@@ -4401,6 +4403,7 @@ const SelectFilterColumn = ({
     store.setPopup2({
       visible: true,
       node: e.currentTarget,
+      container: _container,
       content: jsx(SelectList, {
         value: valType,
         list: [{
@@ -4435,6 +4438,7 @@ const SelectFilterColumn = ({
     store.setPopup2({
       visible: true,
       node: e.currentTarget,
+      container: _container,
       content: jsx(SelectJoinColumn, {
         data: [..._data],
         value: value,
@@ -6540,12 +6544,12 @@ const CaseEditor = props => {
     onOk,
     onCancel
   } = props;
-  const [popup, setPopup] = useState({
-    visible: false
-  }); // 弹框信息
+  // const [popup, setPopup] = useState<PopupType>({ visible: false }); // 弹框信息
   const [caseList, setCaseList] = useState(value.formulaList || []);
   const [name, setName] = useState(value?.name || ''); // 表达式名字
   const [ind, setInd] = useState(-1);
+  const ref = useRef(null);
+  const store = useStore$1();
   const filterCase = useMemo(() => {
     const hasCase = caseList.some(item => item.type === OptionsTypeEnum.OTHER && item.operator === 'case');
     if (hasCase) {
@@ -6557,24 +6561,22 @@ const CaseEditor = props => {
   const usable = useMemo(() => {
     return Array.from(caseList).length > 0 && name;
   }, [caseList, name]);
-  const popupContent = useMemo(() => {
-    let {
-      visible,
-      content
-    } = popup;
-    if (!visible) return null;
-    return content;
-  }, [popup]);
+  // const popupContent = useMemo(() => {
+  //   let { visible, content } = popup;
+  //   if (!visible) return null;
+  //   return content;
+  // }, [popup]);
   function closePopup() {
-    setPopup({
+    store.setPopup({
       visible: false
     });
   }
   // 字段
   function handleField(e, i, val) {
-    setPopup({
+    store.setPopup({
       visible: true,
       node: e.currentTarget,
+      container: ref.current,
       content: jsx(SelectJoinColumn, {
         data: data,
         value: val,
@@ -6604,11 +6606,13 @@ const CaseEditor = props => {
   };
   // 表达式
   function handleExpression(e, i, val) {
-    setPopup({
+    store.setPopup({
       visible: true,
       node: e.currentTarget,
+      container: ref.current,
       content: jsx(SelectFilter, {
         isCustom: true,
+        container: ref.current,
         data: data,
         value: val,
         onChange: data => {
@@ -6810,6 +6814,7 @@ const CaseEditor = props => {
   };
   return jsxs("div", {
     className: 'custom-box',
+    ref: ref,
     children: [jsx(VisualBox$1, {
       children: jsx("div", {
         className: `Sqb-item Sqb-case-editor mb-2 mt-2`,
@@ -6947,13 +6952,6 @@ const CaseEditor = props => {
           })]
         })
       })
-    }), jsx(Popup, {
-      visible: popup.visible,
-      closable: true,
-      node: popup.node,
-      innerSpacing: popup.innerSpacing,
-      hideVisible: closePopup,
-      children: popupContent
     }), jsx("div", {
       className: `btns p-4`,
       children: jsxs("div", {
@@ -7085,7 +7083,7 @@ const CustomColumn = props => {
     }
     return data;
   }
-  // 子查询弹窗
+  // 自定义弹窗
   const showSubQuery = (e, i) => {
     let newMeta = store.metaList[groupIndex].list.slice();
     const _value = newMeta[index].customColumn[i] || [];
@@ -8746,7 +8744,7 @@ const Metabase = props => {
           onClick: onSave,
           children: btnText || __('SqlQueryBuilder.visualize')
         }) : null, store.popupContainer.current && jsx(Popup, {
-          container: store.popupContainer.current,
+          container: store.popupData.container || store.popupContainer.current,
           visible: store.popupData.visible,
           node: store.popupData.node,
           closable: store.popupClosable,
@@ -8758,7 +8756,7 @@ const Metabase = props => {
           },
           children: popupContent
         }), store.popupContainer.current && jsx(Popup, {
-          container: store.popupContainer.current,
+          container: store.popupData2.container || store.popupContainer.current,
           visible: store.popupData2.visible,
           node: store.popupData2.node,
           closable: store.popupClosable2,