@gingkoo/pandora-metabase 1.0.123 → 1.0.124

package/lib/cjs/components/dialog/expression/date-format-picker.d.ts

@@ -3,12 +3,14 @@ interface DateRangeFormatPickerProps {
     value?: string[];
     format?: string;
     onChange?: (val: string[], format?: string) => void;
+    getPopupContainer?: (node: HTMLElement) => Element;
 }
 export declare const DateRangeFormatPicker: React.FC<DateRangeFormatPickerProps>;
 interface DateFormatPickerProps {
     value?: string;
     format?: string;
     onChange?: (val: string, format?: string) => void;
+    getPopupContainer?: (node: HTMLElement) => Element;
 }
 export declare const DateFormatPicker: React.FC<DateFormatPickerProps>;
 export {};

package/lib/cjs/components/dialog/expression/date-format-picker.js

@@ -24,7 +24,8 @@ var DEFAULT_FORMAT = 'YYYY-MM-DD HH:mm';
 var DateRangeFormatPicker = exports.DateRangeFormatPicker = function DateRangeFormatPicker(_ref) {
   var value = _ref.value,
     format = _ref.format,
-    onChange = _ref.onChange;
+    onChange = _ref.onChange,
+    getPopupContainer = _ref.getPopupContainer;
   var _useState = (0, _react.useState)(format || DEFAULT_FORMAT),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     currentFormat = _useState2[0],
@@ -79,6 +80,7 @@ var DateRangeFormatPicker = exports.DateRangeFormatPicker = function DateRangeFo
       },
       value: currentFormat,
       onChange: handleFormatChange,
+      getPopupContainer: getPopupContainer,
       children: DATE_FORMAT_OPTIONS.map(function (option) {
         return (0, _jsxRuntime.jsx)(_pandora.Select.Option, {
           value: option.value,
@@ -93,14 +95,16 @@ var DateRangeFormatPicker = exports.DateRangeFormatPicker = function DateRangeFo
       },
       format: currentFormat,
       showTime: showTime,
-      mode: getRangePickerMode()
+      mode: getRangePickerMode(),
+      getPopupContainer: getPopupContainer
     })]
   });
 };
 var DateFormatPicker = exports.DateFormatPicker = function DateFormatPicker(_ref2) {
   var value = _ref2.value,
     format = _ref2.format,
-    onChange = _ref2.onChange;
+    onChange = _ref2.onChange,
+    getPopupContainer = _ref2.getPopupContainer;
   var _useState3 = (0, _react.useState)(format || DEFAULT_FORMAT),
     _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
     currentFormat = _useState4[0],
@@ -147,7 +151,8 @@ var DateFormatPicker = exports.DateFormatPicker = function DateFormatPicker(_ref
         onChange: handleYearChange,
         style: {
           flex: 1
-        }
+        },
+        getPopupContainer: getPopupContainer
       });
     }
     if (isMonthOnly) {
@@ -157,7 +162,8 @@ var DateFormatPicker = exports.DateFormatPicker = function DateFormatPicker(_ref
         style: {
           flex: 1
         },
-        format: currentFormat
+        format: currentFormat,
+        getPopupContainer: getPopupContainer
       });
     }
     return (0, _jsxRuntime.jsx)(_pandora.DatePicker, {
@@ -167,7 +173,8 @@ var DateFormatPicker = exports.DateFormatPicker = function DateFormatPicker(_ref
         flex: 1
       },
       format: currentFormat,
-      showTime: showTime
+      showTime: showTime,
+      getPopupContainer: getPopupContainer
     });
   };
   return (0, _jsxRuntime.jsxs)("div", {
@@ -181,6 +188,7 @@ var DateFormatPicker = exports.DateFormatPicker = function DateFormatPicker(_ref
       },
       value: currentFormat,
       onChange: handleFormatChange,
+      getPopupContainer: getPopupContainer,
       children: DATE_FORMAT_OPTIONS.map(function (option) {
         return (0, _jsxRuntime.jsx)(_pandora.Select.Option, {
           value: option.value,

package/lib/cjs/components/dialog/expression/index.d.ts

@@ -9,6 +9,7 @@ interface PropsType {
     isCustom?: boolean;
     container?: any;
     filterCustomType?: boolean;
+    parentPopupChannel?: 'primary' | 'secondary';
 }
 declare const _default: (props: PropsType) => import("react/jsx-runtime").JSX.Element;
 export default _default;

package/lib/cjs/components/dialog/expression/index.js

@@ -54,7 +54,8 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
     _ref$container = _ref.container,
     container = _ref$container === void 0 ? null : _ref$container,
     _ref$filterCustomType = _ref.filterCustomType,
-    filterCustomType = _ref$filterCustomType === void 0 ? false : _ref$filterCustomType;
+    filterCustomType = _ref$filterCustomType === void 0 ? false : _ref$filterCustomType,
+    parentPopupChannel = _ref.parentPopupChannel;
   var _useState = (0, _react.useState)(value),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     curColumn = _useState2[0],
@@ -84,6 +85,37 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
     _useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
     isNext = _useState12[0],
     setIsNext = _useState12[1];
+  var setParentClosable = function setParentClosable(closable) {
+    if (parentPopupChannel === 'secondary') {
+      store.setClosable2(closable);
+      return;
+    }
+    store.setClosable(closable);
+  };
+  var setDropdownClosable = function setDropdownClosable(visible) {
+    if (visible) {
+      setParentClosable(false);
+      return;
+    }
+    setTimeout(function () {
+      return setParentClosable(true);
+    }, 300);
+  };
+  var setSelectPopupClosable = function setSelectPopupClosable(visible) {
+    setPopupVisible(visible);
+    if (visible) {
+      setParentClosable(false);
+      return;
+    }
+    setTimeout(function () {
+      return setParentClosable(true);
+    }, 300);
+  };
+  var getCurrentPopupContainer = function getCurrentPopupContainer(node) {
+    var _node$closest;
+    var popupContainer = node === null || node === void 0 || (_node$closest = node.closest) === null || _node$closest === void 0 ? void 0 : _node$closest.call(node, '[data-sqb-popup-container="true"]');
+    return popupContainer || document.body;
+  };
   var table2Selected = Boolean(rhsVal && (rhsVal === null || rhsVal === void 0 ? void 0 : rhsVal.length) > 0);
   var disabled = (0, _react.useMemo)(function () {
     if (!condition) return true;
@@ -362,6 +394,8 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
       return (0, _jsxRuntime.jsx)("div", {
         children: (0, _jsxRuntime.jsx)(_pandora.Dropdown, {
           trigger: ['click'],
+          onVisibleChange: setDropdownClosable,
+          getPopupContainer: getCurrentPopupContainer,
           onChange: function onChange(key) {
             setRhsVal([{
               type: _types.AtomsTypeEnum.INPUT_STRING,
@@ -404,6 +438,8 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
           }
         }), (0, _jsxRuntime.jsx)(_pandora.Dropdown, {
           trigger: ['click'],
+          onVisibleChange: setDropdownClosable,
+          getPopupContainer: getCurrentPopupContainer,
           droplist: [{
             key: '分',
             label: (0, _locale.__)('filter.minute')
@@ -444,6 +480,7 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
       return (0, _jsxRuntime.jsx)(_dateFormatPicker.DateFormatPicker, {
         value: _dateVal,
         format: _dateFormat,
+        getPopupContainer: getCurrentPopupContainer,
         onChange: function onChange(val, format) {
           if (val) {
             setRhsVal([{
@@ -467,6 +504,7 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
       return (0, _jsxRuntime.jsx)(_dateFormatPicker.DateFormatPicker, {
         value: _dateVal2,
         format: _dateFormat2,
+        getPopupContainer: getCurrentPopupContainer,
         onChange: function onChange(val, format) {
           if (val) {
             setRhsVal([{
@@ -492,6 +530,7 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
           placeholder: "\u53EF\u8F93\u5165\u56DE\u8F66\u65B0\u589E\u4E0B\u62C9\u9009\u9879",
           allowCreate: true,
           multiple: true,
+          getPopupContainer: getCurrentPopupContainer,
           value: options,
           onChange: function onChange(val) {
             setRhsVal([{
@@ -501,10 +540,10 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
           },
           popupVisible: popupVisible,
           onBlur: function onBlur() {
-            setPopupVisible(false);
+            setSelectPopupClosable(false);
           },
           onClick: function onClick() {
-            setPopupVisible(true);
+            setSelectPopupClosable(true);
           },
           children: options.map(function (option) {
             return (0, _jsxRuntime.jsx)(_pandora.Select.Option, {
@@ -536,7 +575,7 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
     });
   }
   var selectConstant = function selectConstant(e) {
-    store.setClosable(false);
+    setParentClosable(false);
     var node = e.currentTarget;
     var _val = node.getAttribute('v-val');
     store.setPopup2({
@@ -552,13 +591,13 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
           newVal[0].id = val;
           newVal[0].val = (0, _utils.getConstantLabel)(store.constantList, val);
           setRhsVal(newVal);
-          store.setClosable(true);
+          setParentClosable(true);
         }
       })
     });
   };
   var onRepeat = function onRepeat(e) {
-    store.setClosable(false);
+    setParentClosable(false);
     store.setPopup2({
       visible: true,
       node: e.currentTarget,
@@ -600,13 +639,13 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
               type: _types.AtomsTypeEnum.FIELD
             }]);
           }
-          store.setClosable(true);
+          setParentClosable(true);
         }
       })
     });
   };
   var selectTable = function selectTable(e) {
-    store.setClosable(false);
+    setParentClosable(false);
     var node = e.currentTarget;
     var _index = Number(node.getAttribute('v-index'));
     store.setPopup2({
@@ -633,7 +672,7 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
           store.setPopup2({
             visible: false
           });
-          store.setClosable(true);
+          setParentClosable(true);
         }
       })
     });
@@ -680,6 +719,8 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
         className: 'left-info-formula',
         children: (0, _jsxRuntime.jsx)(_pandora.Dropdown, {
           trigger: ['click'],
+          onVisibleChange: setDropdownClosable,
+          getPopupContainer: getCurrentPopupContainer,
           onChange: function onChange(key) {
             changeFormula(key);
           },
@@ -745,6 +786,8 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
           className: 'right-info',
           children: [filterCustomType && (0, _jsxRuntime.jsx)(_pandora.Dropdown, {
             trigger: ['click'],
+            onVisibleChange: setDropdownClosable,
+            getPopupContainer: getCurrentPopupContainer,
             onChange: function onChange(key) {
               setCondition('');
               setCurColumn((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, curColumn), {}, {
@@ -768,6 +811,8 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
             })
           }), (0, _jsxRuntime.jsx)(_pandora.Dropdown, {
             trigger: ['click'],
+            onVisibleChange: setDropdownClosable,
+            getPopupContainer: getCurrentPopupContainer,
             onChange: function onChange(key) {
               setCurColumn((0, _objectSpread2["default"])({}, curColumn));
               setDefaultVal(key);

package/lib/cjs/components/dialog/formula-list/index.js

@@ -633,6 +633,11 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
       visible: false
     });
   }
+  var getCurrentPopupContainer = function getCurrentPopupContainer(node) {
+    var _node$closest;
+    var popupContainer = node === null || node === void 0 || (_node$closest = node.closest) === null || _node$closest === void 0 ? void 0 : _node$closest.call(node, '[data-sqb-popup-container="true"]');
+    return popupContainer || document.body;
+  };
   var getSelectTriggerProps = function getSelectTriggerProps() {
     return {
       clickToClose: true,
@@ -657,6 +662,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
       showSearch: true,
       trigger: trigger,
       triggerProps: getSelectTriggerProps(),
+      getPopupContainer: getCurrentPopupContainer,
       virtualListProps: {
         threshold: null
       },
@@ -754,6 +760,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
         filterCustomType: filterCustomType,
         data: data,
         container: ref === null || ref === void 0 ? void 0 : ref.current,
+        parentPopupChannel: 'primary',
         value: val || {},
         onChange: function onChange(data) {
           var _caseList = caseList.slice();
@@ -1216,6 +1223,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
         }),
         node: (0, _jsxRuntime.jsx)(_pandora.Select, {
           triggerProps: getSelectTriggerProps(),
+          getPopupContainer: getCurrentPopupContainer,
           value: v.val,
           triggerElement: function triggerElement() {
             return renderTokenContent((0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
@@ -1317,6 +1325,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
         }),
         node: (0, _jsxRuntime.jsx)(_pandora.Select, {
           triggerProps: getSelectTriggerProps(),
+          getPopupContainer: getCurrentPopupContainer,
           multiple: v.multiple,
           value: v.val,
           triggerElement: function triggerElement() {

package/lib/cjs/components/modules/custom-column.js

@@ -26,6 +26,7 @@ var _metaIcon = _interopRequireDefault(require("./components/meta-icon"));
 var _header = _interopRequireDefault(require("./components/header"));
 var _itemWrapper = _interopRequireDefault(require("./components/item-wrapper"));
 var _itemName = _interopRequireDefault(require("./components/item-name"));
+var _helperDom = require("../../utils/helper-dom");
 var CustomColumn = function CustomColumn(props) {
   var meta = props.meta,
     groupIndex = props.groupIndex;
@@ -213,7 +214,9 @@ var CustomColumn = function CustomColumn(props) {
   var showSubQuery = function showSubQuery(e, i) {
     var newMeta = store.metaList[groupIndex].list.slice();
     var _value = newMeta[index].customColumn[i] || [];
+    var childModalZIndex = (0, _helperDom.getTopLayerZIndex)() + 1;
     var o = _pandora.Modal2.openModal({
+      zIndex: childModalZIndex,
       title: (0, _locale.__)('SqlQueryBuilder.customExpression'),
       transparentMask: true,
       content: (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {

package/lib/cjs/components/modules/summarize/group-by.js

@@ -365,7 +365,6 @@ var GroupBy = function GroupBy(props) {
                 newMeta = store.metaList[groupIndex].list.slice();
                 newMeta[index].by[i].fieldAlias = fieldAlias;
                 newMeta[index].by[i].sql = (0, _helper2.summarizeByToSql)(newMeta[index].by[i]);
-                newMeta = (0, _utils.changeFieldAlias)(newMeta, newMeta[index].by[i]);
                 store.setMeta(newMeta, groupIndex, {
                   obj: newMeta[index].by,
                   type: _types.ChangeType.by
@@ -460,6 +459,10 @@ var GroupBy = function GroupBy(props) {
     var field = getField(record);
     return field.fieldName ? [field] : [];
   };
+  var getErrorCheckField = function getErrorCheckField(record) {
+    var atoms = getAtomsValue(record);
+    return _getFirstField(atoms) || getField(record);
+  };
   var normalizeByRecord = function normalizeByRecord(record, itemIndex, metaList) {
     var _store$preProps;
     var atoms = getAtomsValue(record);
@@ -496,7 +499,7 @@ var GroupBy = function GroupBy(props) {
   return (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [meta.by.map(function (v, i) {
       return (0, _jsxRuntime.jsx)(_itemName["default"], {
-        isError: (0, _utils.isExistsError)([getField(v)], store.existsError),
+        isError: (0, _utils.isExistsError)([getErrorCheckField(v)], store.existsError),
         children: (0, _jsxRuntime.jsxs)("div", {
           className: "Sqb-TableName green-name",
           onClick: function onClick(e) {

package/lib/cjs/components/modules/summarize/select-index.js

@@ -161,7 +161,11 @@ var SelectIndex = function SelectIndex(props) {
             _pandora.Toast.warning(summarizeWithoutArgumentMessage);
             return;
           }
-          newMeta[index].group.splice(i, 1, normalizeGroupRecord(data));
+          var prevRecord = newMeta[index].group[i];
+          var nextRecord = normalizeGroupRecord(data);
+          nextRecord.fieldAlias = (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord.fieldAlias) || nextRecord.fieldAlias;
+          nextRecord.fieldUuid = (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord.fieldUuid) || nextRecord.fieldUuid;
+          newMeta[index].group.splice(i, 1, nextRecord);
           newMeta[index].group = newMeta[index].group.map(function (v) {
             var _summarizeToSql = (0, _helper.summarizeToSql)(newMeta[index].group, v),
               sql = _summarizeToSql.sql,
@@ -169,7 +173,8 @@ var SelectIndex = function SelectIndex(props) {
             return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
               name: v.name || v.quotes,
               sql: sql,
-              fieldAlias: fieldAlias
+              fieldUuid: v.fieldUuid || (0, _helper2.uuidv4)('field'),
+              fieldAlias: v.fieldAlias || fieldAlias
             });
           });
           store.setMeta(newMeta, groupIndex, {
@@ -221,7 +226,7 @@ var SelectIndex = function SelectIndex(props) {
             return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
               name: v.name || v.quotes,
               sql: sql,
-              fieldUuid: (0, _helper2.uuidv4)('field'),
+              fieldUuid: v.fieldUuid || (0, _helper2.uuidv4)('field'),
               fieldAlias: v.fieldAlias || fieldAlias,
               summarizeType: _types.MetaSummarize_Enum.GROUP
             });
@@ -276,7 +281,6 @@ var SelectIndex = function SelectIndex(props) {
                 newMeta = store.metaList[groupIndex].list.slice();
                 newMeta[index].group[i].fieldAlias = fieldAlias;
                 newMeta[index].group[i].sql = newMeta[index].group[i].sql.split('AS ')[0] + "AS ".concat(fieldAlias);
-                newMeta = (0, _utils.changeFieldAlias)(newMeta, newMeta[index].group[i]);
                 store.setMeta(newMeta, groupIndex, {
                   obj: newMeta[index].group,
                   type: _types.ChangeType.group
@@ -379,6 +383,10 @@ var SelectIndex = function SelectIndex(props) {
     var field = getField(record);
     return field.fieldName ? [field] : [];
   };
+  var getErrorCheckField = function getErrorCheckField(record) {
+    var atoms = getAtomsValue(record);
+    return _getFirstField(atoms) || getField(record);
+  };
   var normalizeGroupRecord = function normalizeGroupRecord(record) {
     var atoms = getAtomsValue(record);
     var firstField = _getFirstField(atoms);
@@ -406,7 +414,7 @@ var SelectIndex = function SelectIndex(props) {
   return (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [meta.group.map(function (v, i) {
       return (0, _jsxRuntime.jsx)(_itemName["default"], {
-        isError: (0, _utils.isExistsError)([getField(v)], store.existsError),
+        isError: (0, _utils.isExistsError)([getErrorCheckField(v)], store.existsError),
         children: (0, _jsxRuntime.jsxs)("div", {
           className: "Sqb-TableName green-name",
           onClick: function onClick(e) {

package/lib/es/components/dialog/expression/date-format-picker.d.ts

@@ -3,12 +3,14 @@ interface DateRangeFormatPickerProps {
     value?: string[];
     format?: string;
     onChange?: (val: string[], format?: string) => void;
+    getPopupContainer?: (node: HTMLElement) => Element;
 }
 export declare const DateRangeFormatPicker: React.FC<DateRangeFormatPickerProps>;
 interface DateFormatPickerProps {
     value?: string;
     format?: string;
     onChange?: (val: string, format?: string) => void;
+    getPopupContainer?: (node: HTMLElement) => Element;
 }
 export declare const DateFormatPicker: React.FC<DateFormatPickerProps>;
 export {};

package/lib/es/components/dialog/expression/date-format-picker.js

@@ -17,7 +17,8 @@ var DEFAULT_FORMAT = 'YYYY-MM-DD HH:mm';
 export var DateRangeFormatPicker = function DateRangeFormatPicker(_ref) {
   var value = _ref.value,
     format = _ref.format,
-    onChange = _ref.onChange;
+    onChange = _ref.onChange,
+    getPopupContainer = _ref.getPopupContainer;
   var _useState = useState(format || DEFAULT_FORMAT),
     _useState2 = _slicedToArray(_useState, 2),
     currentFormat = _useState2[0],
@@ -72,6 +73,7 @@ export var DateRangeFormatPicker = function DateRangeFormatPicker(_ref) {
       },
       value: currentFormat,
       onChange: handleFormatChange,
+      getPopupContainer: getPopupContainer,
       children: DATE_FORMAT_OPTIONS.map(function (option) {
         return _jsx(Select.Option, {
           value: option.value,
@@ -86,14 +88,16 @@ export var DateRangeFormatPicker = function DateRangeFormatPicker(_ref) {
       },
       format: currentFormat,
       showTime: showTime,
-      mode: getRangePickerMode()
+      mode: getRangePickerMode(),
+      getPopupContainer: getPopupContainer
     })]
   });
 };
 export var DateFormatPicker = function DateFormatPicker(_ref2) {
   var value = _ref2.value,
     format = _ref2.format,
-    onChange = _ref2.onChange;
+    onChange = _ref2.onChange,
+    getPopupContainer = _ref2.getPopupContainer;
   var _useState3 = useState(format || DEFAULT_FORMAT),
     _useState4 = _slicedToArray(_useState3, 2),
     currentFormat = _useState4[0],
@@ -140,7 +144,8 @@ export var DateFormatPicker = function DateFormatPicker(_ref2) {
         onChange: handleYearChange,
         style: {
           flex: 1
-        }
+        },
+        getPopupContainer: getPopupContainer
       });
     }
     if (isMonthOnly) {
@@ -150,7 +155,8 @@ export var DateFormatPicker = function DateFormatPicker(_ref2) {
         style: {
           flex: 1
         },
-        format: currentFormat
+        format: currentFormat,
+        getPopupContainer: getPopupContainer
       });
     }
     return _jsx(DatePicker, {
@@ -160,7 +166,8 @@ export var DateFormatPicker = function DateFormatPicker(_ref2) {
         flex: 1
       },
       format: currentFormat,
-      showTime: showTime
+      showTime: showTime,
+      getPopupContainer: getPopupContainer
     });
   };
   return _jsxs("div", {
@@ -174,6 +181,7 @@ export var DateFormatPicker = function DateFormatPicker(_ref2) {
       },
       value: currentFormat,
       onChange: handleFormatChange,
+      getPopupContainer: getPopupContainer,
       children: DATE_FORMAT_OPTIONS.map(function (option) {
         return _jsx(Select.Option, {
           value: option.value,

package/lib/es/components/dialog/expression/index.d.ts

@@ -9,6 +9,7 @@ interface PropsType {
     isCustom?: boolean;
     container?: any;
     filterCustomType?: boolean;
+    parentPopupChannel?: 'primary' | 'secondary';
 }
 declare const _default: (props: PropsType) => import("react/jsx-runtime").JSX.Element;
 export default _default;

package/lib/es/components/dialog/expression/index.js

@@ -46,7 +46,8 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
     _ref$container = _ref.container,
     container = _ref$container === void 0 ? null : _ref$container,
     _ref$filterCustomType = _ref.filterCustomType,
-    filterCustomType = _ref$filterCustomType === void 0 ? false : _ref$filterCustomType;
+    filterCustomType = _ref$filterCustomType === void 0 ? false : _ref$filterCustomType,
+    parentPopupChannel = _ref.parentPopupChannel;
   var _useState = useState(value),
     _useState2 = _slicedToArray(_useState, 2),
     curColumn = _useState2[0],
@@ -76,6 +77,37 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
     _useState12 = _slicedToArray(_useState11, 2),
     isNext = _useState12[0],
     setIsNext = _useState12[1];
+  var setParentClosable = function setParentClosable(closable) {
+    if (parentPopupChannel === 'secondary') {
+      store.setClosable2(closable);
+      return;
+    }
+    store.setClosable(closable);
+  };
+  var setDropdownClosable = function setDropdownClosable(visible) {
+    if (visible) {
+      setParentClosable(false);
+      return;
+    }
+    setTimeout(function () {
+      return setParentClosable(true);
+    }, 300);
+  };
+  var setSelectPopupClosable = function setSelectPopupClosable(visible) {
+    setPopupVisible(visible);
+    if (visible) {
+      setParentClosable(false);
+      return;
+    }
+    setTimeout(function () {
+      return setParentClosable(true);
+    }, 300);
+  };
+  var getCurrentPopupContainer = function getCurrentPopupContainer(node) {
+    var _node$closest;
+    var popupContainer = node === null || node === void 0 || (_node$closest = node.closest) === null || _node$closest === void 0 ? void 0 : _node$closest.call(node, '[data-sqb-popup-container="true"]');
+    return popupContainer || document.body;
+  };
   var table2Selected = Boolean(rhsVal && (rhsVal === null || rhsVal === void 0 ? void 0 : rhsVal.length) > 0);
   var disabled = useMemo(function () {
     if (!condition) return true;
@@ -354,6 +386,8 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
       return _jsx("div", {
         children: _jsx(Dropdown, {
           trigger: ['click'],
+          onVisibleChange: setDropdownClosable,
+          getPopupContainer: getCurrentPopupContainer,
           onChange: function onChange(key) {
             setRhsVal([{
               type: AtomsTypeEnum.INPUT_STRING,
@@ -396,6 +430,8 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
           }
         }), _jsx(Dropdown, {
           trigger: ['click'],
+          onVisibleChange: setDropdownClosable,
+          getPopupContainer: getCurrentPopupContainer,
           droplist: [{
             key: '分',
             label: __('filter.minute')
@@ -436,6 +472,7 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
       return _jsx(DateFormatPicker, {
         value: _dateVal,
         format: _dateFormat,
+        getPopupContainer: getCurrentPopupContainer,
         onChange: function onChange(val, format) {
           if (val) {
             setRhsVal([{
@@ -459,6 +496,7 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
       return _jsx(DateFormatPicker, {
         value: _dateVal2,
         format: _dateFormat2,
+        getPopupContainer: getCurrentPopupContainer,
         onChange: function onChange(val, format) {
           if (val) {
             setRhsVal([{
@@ -484,6 +522,7 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
           placeholder: "\u53EF\u8F93\u5165\u56DE\u8F66\u65B0\u589E\u4E0B\u62C9\u9009\u9879",
           allowCreate: true,
           multiple: true,
+          getPopupContainer: getCurrentPopupContainer,
           value: options,
           onChange: function onChange(val) {
             setRhsVal([{
@@ -493,10 +532,10 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
           },
           popupVisible: popupVisible,
           onBlur: function onBlur() {
-            setPopupVisible(false);
+            setSelectPopupClosable(false);
           },
           onClick: function onClick() {
-            setPopupVisible(true);
+            setSelectPopupClosable(true);
           },
           children: options.map(function (option) {
             return _jsx(Select.Option, {
@@ -528,7 +567,7 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
     });
   }
   var selectConstant = function selectConstant(e) {
-    store.setClosable(false);
+    setParentClosable(false);
     var node = e.currentTarget;
     var _val = node.getAttribute('v-val');
     store.setPopup2({
@@ -544,13 +583,13 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
           newVal[0].id = val;
           newVal[0].val = getConstantLabel(store.constantList, val);
           setRhsVal(newVal);
-          store.setClosable(true);
+          setParentClosable(true);
         }
       })
     });
   };
   var onRepeat = function onRepeat(e) {
-    store.setClosable(false);
+    setParentClosable(false);
     store.setPopup2({
       visible: true,
       node: e.currentTarget,
@@ -592,13 +631,13 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
               type: AtomsTypeEnum.FIELD
             }]);
           }
-          store.setClosable(true);
+          setParentClosable(true);
         }
       })
     });
   };
   var selectTable = function selectTable(e) {
-    store.setClosable(false);
+    setParentClosable(false);
     var node = e.currentTarget;
     var _index = Number(node.getAttribute('v-index'));
     store.setPopup2({
@@ -625,7 +664,7 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
           store.setPopup2({
             visible: false
           });
-          store.setClosable(true);
+          setParentClosable(true);
         }
       })
     });
@@ -672,6 +711,8 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
         className: 'left-info-formula',
         children: _jsx(Dropdown, {
           trigger: ['click'],
+          onVisibleChange: setDropdownClosable,
+          getPopupContainer: getCurrentPopupContainer,
           onChange: function onChange(key) {
             changeFormula(key);
           },
@@ -737,6 +778,8 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
           className: 'right-info',
           children: [filterCustomType && _jsx(Dropdown, {
             trigger: ['click'],
+            onVisibleChange: setDropdownClosable,
+            getPopupContainer: getCurrentPopupContainer,
             onChange: function onChange(key) {
               setCondition('');
               setCurColumn(_objectSpread(_objectSpread({}, curColumn), {}, {
@@ -760,6 +803,8 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
             })
           }), _jsx(Dropdown, {
             trigger: ['click'],
+            onVisibleChange: setDropdownClosable,
+            getPopupContainer: getCurrentPopupContainer,
             onChange: function onChange(key) {
               setCurColumn(_objectSpread({}, curColumn));
               setDefaultVal(key);

package/lib/es/components/dialog/formula-list/index.js

@@ -624,6 +624,11 @@ var FormulaList = forwardRef(function (props, ref) {
       visible: false
     });
   }
+  var getCurrentPopupContainer = function getCurrentPopupContainer(node) {
+    var _node$closest;
+    var popupContainer = node === null || node === void 0 || (_node$closest = node.closest) === null || _node$closest === void 0 ? void 0 : _node$closest.call(node, '[data-sqb-popup-container="true"]');
+    return popupContainer || document.body;
+  };
   var getSelectTriggerProps = function getSelectTriggerProps() {
     return {
       clickToClose: true,
@@ -648,6 +653,7 @@ var FormulaList = forwardRef(function (props, ref) {
       showSearch: true,
       trigger: trigger,
       triggerProps: getSelectTriggerProps(),
+      getPopupContainer: getCurrentPopupContainer,
       virtualListProps: {
         threshold: null
       },
@@ -745,6 +751,7 @@ var FormulaList = forwardRef(function (props, ref) {
         filterCustomType: filterCustomType,
         data: data,
         container: ref === null || ref === void 0 ? void 0 : ref.current,
+        parentPopupChannel: 'primary',
         value: val || {},
         onChange: function onChange(data) {
           var _caseList = caseList.slice();
@@ -1207,6 +1214,7 @@ var FormulaList = forwardRef(function (props, ref) {
         }),
         node: _jsx(Select, {
           triggerProps: getSelectTriggerProps(),
+          getPopupContainer: getCurrentPopupContainer,
           value: v.val,
           triggerElement: function triggerElement() {
             return renderTokenContent(_jsxs(_Fragment, {
@@ -1308,6 +1316,7 @@ var FormulaList = forwardRef(function (props, ref) {
         }),
         node: _jsx(Select, {
           triggerProps: getSelectTriggerProps(),
+          getPopupContainer: getCurrentPopupContainer,
           multiple: v.multiple,
           value: v.val,
           triggerElement: function triggerElement() {

package/lib/es/components/modules/custom-column.js

@@ -21,6 +21,7 @@ import NextDom from './components/meta-icon';
 import Header from './components/header';
 import ItemWrapper from './components/item-wrapper';
 import ItemName from './components/item-name';
+import { getTopLayerZIndex } from '../../utils/helper-dom';
 import { useStore } from '../../hooks/use-provider';
 var CustomColumn = function CustomColumn(props) {
   var meta = props.meta,
@@ -209,7 +210,9 @@ var CustomColumn = function CustomColumn(props) {
   var showSubQuery = function showSubQuery(e, i) {
     var newMeta = store.metaList[groupIndex].list.slice();
     var _value = newMeta[index].customColumn[i] || [];
+    var childModalZIndex = getTopLayerZIndex() + 1;
     var o = Modal2.openModal({
+      zIndex: childModalZIndex,
       title: __('SqlQueryBuilder.customExpression'),
       transparentMask: true,
       content: _jsx(_Fragment, {

package/lib/es/components/modules/summarize/group-by.js

@@ -14,7 +14,7 @@ import { TypeEnum, SQL_COLUMN_TYPE } from '../../../store/enum';
 import { MetaSummarize_Enum, AtomsTypeEnum, ChangeType } from '../../../store/types';
 import { Tooltip, Button, Modal, Input, Toast } from '@gingkoo/pandora';
 import { uuidv4, getAlias } from '../../../utils/helper';
-import { changeFieldAlias, isExistsError, isValidSQLAlias } from '../../../utils';
+import { isExistsError, isValidSQLAlias } from '../../../utils';
 import ItemName from '../components/item-name';
 import { AddIcon, CloseIcon } from '../../icons';
 import FormulaList from '../../dialog/formula-list';
@@ -359,7 +359,6 @@ var GroupBy = function GroupBy(props) {
                 newMeta = store.metaList[groupIndex].list.slice();
                 newMeta[index].by[i].fieldAlias = fieldAlias;
                 newMeta[index].by[i].sql = summarizeByToSql(newMeta[index].by[i]);
-                newMeta = changeFieldAlias(newMeta, newMeta[index].by[i]);
                 store.setMeta(newMeta, groupIndex, {
                   obj: newMeta[index].by,
                   type: ChangeType.by
@@ -454,6 +453,10 @@ var GroupBy = function GroupBy(props) {
     var field = getField(record);
     return field.fieldName ? [field] : [];
   };
+  var getErrorCheckField = function getErrorCheckField(record) {
+    var atoms = getAtomsValue(record);
+    return _getFirstField(atoms) || getField(record);
+  };
   var normalizeByRecord = function normalizeByRecord(record, itemIndex, metaList) {
     var _store$preProps;
     var atoms = getAtomsValue(record);
@@ -490,7 +493,7 @@ var GroupBy = function GroupBy(props) {
   return _jsxs(_Fragment, {
     children: [meta.by.map(function (v, i) {
       return _jsx(ItemName, {
-        isError: isExistsError([getField(v)], store.existsError),
+        isError: isExistsError([getErrorCheckField(v)], store.existsError),
         children: _jsxs("div", {
           className: "Sqb-TableName green-name",
           onClick: function onClick(e) {

package/lib/es/components/modules/summarize/select-index.js

@@ -13,7 +13,7 @@ import { summarizeToSql } from '../../../store/helper';
 import { Tooltip, Button, Modal, Input, Toast } from '@gingkoo/pandora';
 import { uuidv4 } from '../../../utils/helper';
 import { MetaSummarize_Enum, AtomsTypeEnum, ChangeType } from '../../../store/types';
-import { changeFieldAlias, isExistsError, isValidSQLAlias } from '../../../utils';
+import { isExistsError, isValidSQLAlias } from '../../../utils';
 import ItemName from '../components/item-name';
 import { AddIcon, CloseIcon } from '../../icons';
 import { SelectSummarize } from '../../dialog';
@@ -155,7 +155,11 @@ var SelectIndex = function SelectIndex(props) {
             Toast.warning(summarizeWithoutArgumentMessage);
             return;
           }
-          newMeta[index].group.splice(i, 1, normalizeGroupRecord(data));
+          var prevRecord = newMeta[index].group[i];
+          var nextRecord = normalizeGroupRecord(data);
+          nextRecord.fieldAlias = (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord.fieldAlias) || nextRecord.fieldAlias;
+          nextRecord.fieldUuid = (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord.fieldUuid) || nextRecord.fieldUuid;
+          newMeta[index].group.splice(i, 1, nextRecord);
           newMeta[index].group = newMeta[index].group.map(function (v) {
             var _summarizeToSql = summarizeToSql(newMeta[index].group, v),
               sql = _summarizeToSql.sql,
@@ -163,7 +167,8 @@ var SelectIndex = function SelectIndex(props) {
             return _objectSpread(_objectSpread({}, v), {}, {
               name: v.name || v.quotes,
               sql: sql,
-              fieldAlias: fieldAlias
+              fieldUuid: v.fieldUuid || uuidv4('field'),
+              fieldAlias: v.fieldAlias || fieldAlias
             });
           });
           store.setMeta(newMeta, groupIndex, {
@@ -215,7 +220,7 @@ var SelectIndex = function SelectIndex(props) {
             return _objectSpread(_objectSpread({}, v), {}, {
               name: v.name || v.quotes,
               sql: sql,
-              fieldUuid: uuidv4('field'),
+              fieldUuid: v.fieldUuid || uuidv4('field'),
               fieldAlias: v.fieldAlias || fieldAlias,
               summarizeType: MetaSummarize_Enum.GROUP
             });
@@ -270,7 +275,6 @@ var SelectIndex = function SelectIndex(props) {
                 newMeta = store.metaList[groupIndex].list.slice();
                 newMeta[index].group[i].fieldAlias = fieldAlias;
                 newMeta[index].group[i].sql = newMeta[index].group[i].sql.split('AS ')[0] + "AS ".concat(fieldAlias);
-                newMeta = changeFieldAlias(newMeta, newMeta[index].group[i]);
                 store.setMeta(newMeta, groupIndex, {
                   obj: newMeta[index].group,
                   type: ChangeType.group
@@ -373,6 +377,10 @@ var SelectIndex = function SelectIndex(props) {
     var field = getField(record);
     return field.fieldName ? [field] : [];
   };
+  var getErrorCheckField = function getErrorCheckField(record) {
+    var atoms = getAtomsValue(record);
+    return _getFirstField(atoms) || getField(record);
+  };
   var normalizeGroupRecord = function normalizeGroupRecord(record) {
     var atoms = getAtomsValue(record);
     var firstField = _getFirstField(atoms);
@@ -400,7 +408,7 @@ var SelectIndex = function SelectIndex(props) {
   return _jsxs(_Fragment, {
     children: [meta.group.map(function (v, i) {
       return _jsx(ItemName, {
-        isError: isExistsError([getField(v)], store.existsError),
+        isError: isExistsError([getErrorCheckField(v)], store.existsError),
         children: _jsxs("div", {
           className: "Sqb-TableName green-name",
           onClick: function onClick(e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gingkoo/pandora-metabase",
-  "version": "1.0.123",
+  "version": "1.0.124",
   "description": "",
   "main": "lib/es/index.js",
   "module": "lib/es/index.js",