@gingkoo/pandora-metabase 1.0.111 → 1.0.113

package/lib/cjs/components/dialog/custom-editor/index.js

@@ -19,17 +19,20 @@ var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _types = require("../../../store/types");
 var _pandora = require("@gingkoo/pandora");
 var _utils2 = require("../../../utils");
+var _useProvider = require("../../../hooks/use-provider");
 var _templateObject; // import { getTemplate } from './utils';
 // import { OptionsTypeEnum, customTypes, otherList, operatorList, functionList } from './enum';
 var VisualBox = _styledComponents["default"].div.attrs({
   className: 'visual-box'
 })(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])([""])));
 var CaseEditor = function CaseEditor(props) {
+  var _store$preProps;
   var value = props.value,
     data = props.data,
     exitData = props.exitData,
     onOk = props.onOk,
     onCancel = props.onCancel;
+  var store = (0, _useProvider.useStore)();
   // const [popup, setPopup] = useState<PopupType>({ visible: false }); // 弹框信息
   var _useState = (0, _react.useState)(value.formulaList || []),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
@@ -89,6 +92,7 @@ var CaseEditor = function CaseEditor(props) {
             })]
           }), (0, _jsxRuntime.jsx)(_formulaList["default"], {
             isCustom: true,
+            otherTypes: (_store$preProps = store.preProps) === null || _store$preProps === void 0 ? void 0 : _store$preProps.otherTypes,
             value: caseList,
             data: data,
             exitData: exitData,

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

@@ -186,7 +186,7 @@ var CaseEditor = _react["default"].forwardRef(function (props, ref) {
             })]
           }), fun === null || fun === void 0 || (_fun$args = fun.args) === null || _fun$args === void 0 ? void 0 : _fun$args.map(function (v, i) {
             if (v.type === _types.AtomsTypeEnum.COLLECTION) {
-              var _formulaList$fun$name3;
+              var _store$preProps, _formulaList$fun$name3;
               return (0, _jsxRuntime.jsxs)("div", {
                 className: 'Sqb-item-formula-args',
                 children: [(0, _jsxRuntime.jsxs)("div", {
@@ -199,6 +199,7 @@ var CaseEditor = _react["default"].forwardRef(function (props, ref) {
                     },
                     children: ["\u53C2\u6570", i + 1, ":"]
                   }), (0, _jsxRuntime.jsx)(_formulaList["default"], {
+                    otherTypes: (_store$preProps = store.preProps) === null || _store$preProps === void 0 ? void 0 : _store$preProps.otherTypes,
                     check: (formulaList === null || formulaList === void 0 || (_formulaList$fun$name3 = formulaList[fun.name]) === null || _formulaList$fun$name3 === void 0 || (_formulaList$fun$name3 = _formulaList$fun$name3.args) === null || _formulaList$fun$name3 === void 0 || (_formulaList$fun$name3 = _formulaList$fun$name3[i]) === null || _formulaList$fun$name3 === void 0 ? void 0 : _formulaList$fun$name3.check) || '',
                     value: v.list,
                     data: data,

package/lib/cjs/components/dialog/formula-list/index.d.ts

@@ -3,6 +3,7 @@ import './index.less';
 import { AtomsItem } from '../../../store/types';
 interface PropsType {
     customTypes?: any[];
+    otherTypes?: any[];
     operatorList?: string[];
     value: AtomsItem[];
     data: any;

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

@@ -68,6 +68,8 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     onChange = props.onChange,
     _props$customTypes = props.customTypes,
     _customTypes = _props$customTypes === void 0 ? _utils3.customTypes : _props$customTypes,
+    _props$otherTypes = props.otherTypes,
+    otherTypes = _props$otherTypes === void 0 ? [] : _props$otherTypes,
     _props$isCustom = props.isCustom,
     isCustom = _props$isCustom === void 0 ? false : _props$isCustom,
     _props$showPreview = props.showPreview,
@@ -75,6 +77,26 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     check = props.check,
     _props$_type = props._type,
     _type = _props$_type === void 0 ? 'filter' : _props$_type;
+  var mergedTypes = (0, _react.useMemo)(function () {
+    var map = new Map();
+    [].concat((0, _toConsumableArray2["default"])(_customTypes), (0, _toConsumableArray2["default"])(otherTypes)).forEach(function (item) {
+      var _item$value;
+      var key = String((_item$value = item === null || item === void 0 ? void 0 : item.value) !== null && _item$value !== void 0 ? _item$value : '');
+      if (!key) return;
+      map.set(key, item);
+    });
+    return Array.from(map.values());
+  }, [_customTypes, otherTypes]);
+  var otherTypeMap = (0, _react.useMemo)(function () {
+    var map = new Map();
+    (otherTypes || []).forEach(function (item) {
+      var _item$value2;
+      var key = String((_item$value2 = item === null || item === void 0 ? void 0 : item.value) !== null && _item$value2 !== void 0 ? _item$value2 : '');
+      if (!key) return;
+      map.set(key, item);
+    });
+    return map;
+  }, [otherTypes]);
   var _useState3 = (0, _react.useState)((0, _cloneDeep["default"])(value)),
     _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
     caseList = _useState4[0],
@@ -252,7 +274,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
           value: option,
           children: option
         }, index + '' + ind);
-      }) : _customTypes.map(function (option, index) {
+      }) : mergedTypes.map(function (option, index) {
         return (0, _jsxRuntime.jsx)(_pandora.Select.Option, {
           value: option.value,
           children: option.label
@@ -283,11 +305,17 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
   // 常量
   var handleConstant = function handleConstant(val, i) {
     var _caseList = caseList.slice();
+    var currentItem = _caseList[i];
     var oldVal = _caseList[i].val;
     var oldType = _caseList[i].type;
+    var otherTypeConfig = otherTypeMap.get(String(oldType));
     if (oldType === _types.AtomsTypeEnum.CONSTANT) {
       _caseList[i].id = val;
       _caseList[i].val = (0, _utils3.getConstantLabel)(store.constantList, val);
+    } else if (otherTypeConfig) {
+      var sourceList = (currentItem === null || currentItem === void 0 ? void 0 : currentItem.list) || otherTypeConfig.list || [];
+      _caseList[i].id = val;
+      _caseList[i].val = (0, _utils3.getConstantLabel)(sourceList, val);
     } else {
       _caseList[i].val = val;
     }
@@ -447,7 +475,12 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
   var addOperator = function addOperator(type, index, position) {
     var _caseList = caseList.slice() || [];
     var _ind = index;
-    var temItem = (0, _utils3.getTemplateItem)(type);
+    var otherTypeConfig = otherTypeMap.get(String(type));
+    var temItem = otherTypeConfig ? {
+      id: '',
+      val: '',
+      type: type
+    } : (0, _utils3.getTemplateItem)(type);
     if (position === 'add') {
       _caseList.push(temItem);
       _ind = index + 1;
@@ -571,13 +604,17 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     var node = e.currentTarget;
     var _ind = Number(node.getAttribute('v-index'));
     var _val = node.getAttribute('v-val');
+    var _type = node.getAttribute('v-type') || '';
+    var currentItem = caseList[_ind];
+    var otherTypeConfig = otherTypeMap.get(_type);
+    var listSource = (currentItem === null || currentItem === void 0 ? void 0 : currentItem.list) || (otherTypeConfig === null || otherTypeConfig === void 0 ? void 0 : otherTypeConfig.list) || store.constantList || [];
     store.setPopup({
       visible: true,
       node: e.currentTarget,
       container: ref === null || ref === void 0 ? void 0 : ref.current,
       content: (0, _jsxRuntime.jsx)(_selectList["default"], {
         value: _val,
-        list: store.constantList || [],
+        list: listSource,
         onChange: function onChange(val) {
           closePopup();
           handleConstant(val, _ind);
@@ -785,6 +822,32 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
           })]
         })
       }, index);
+    } else if (otherTypeMap.has(String(type))) {
+      // 业务自定义常量类型（otherTypes）
+      var currentOtherType = otherTypeMap.get(String(type));
+      var listSource = (currentOtherType === null || currentOtherType === void 0 ? void 0 : currentOtherType.list) || [];
+      return (0, _jsxRuntime.jsx)(_itemName["default"], {
+        isError: !!(v.id || v.val) && !(0, _utils3.getConstantLabel)(listSource, v.id || v.val),
+        message: "\u5E38\u91CF\u4E22\u5931",
+        children: (0, _jsxRuntime.jsxs)("div", {
+          className: (0, _classnames["default"])("Sqb-TableName", {
+            notSelected: !v.val
+          }),
+          "v-index": index,
+          "v-val": v.id || v.val,
+          "v-type": type,
+          onClick: selectConstant,
+          children: [(0, _utils3.getConstantLabel)(listSource, v.id || v.val, v.val) || "\u8BF7\u9009\u62E9".concat(currentOtherType.label), (0, _jsxRuntime.jsx)("span", {
+            style: {
+              fontSize: 0
+            },
+            onClick: function onClick(e) {
+              return handleDel(e, index);
+            },
+            children: (0, _jsxRuntime.jsx)(_icons.CloseIcon, {})
+          })]
+        })
+      }, index);
     } else if (type === _types.AtomsTypeEnum.EXPRESSION) {
       if (~['早于', '晚于', '在'].indexOf(v.condition) && v.rhs.length > 1) {
         var _caseList$index$quote;

package/lib/cjs/components/modules/components/meta-icon.js

@@ -382,10 +382,26 @@ var NextDom = function NextDom(props) {
       className: "Sqb-item--func",
       children: sortList(available).filter(function (v) {
         return ~store.toolbar.indexOf(v);
-      }).map(function (v) {
-        return (0, _jsxRuntime.jsx)(MetaIconDom, {
-          type: v
-        }, v);
+      }).map(function (v, idx) {
+        var info = IconTypeMap.get(v);
+        return (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
+          title: size === IconSIzeEnum.SMALL ? info.name : '',
+          placement: 'top',
+          children: (0, _jsxRuntime.jsx)("button", {
+            className: (0, _classnames["default"])("Sqb-button ".concat(info.className || ''), {
+              small: size === IconSIzeEnum.SMALL,
+              large: size === IconSIzeEnum.LARGE
+            }),
+            onClick: function onClick() {
+              return handleClick(v);
+            },
+            children: (0, _jsxRuntime.jsxs)("div", {
+              children: [info.icon, size === IconSIzeEnum.LARGE ? (0, _jsxRuntime.jsx)("div", {
+                children: info.name
+              }) : '']
+            })
+          })
+        }, "".concat(String(v), "-").concat(idx));
       })
     })]
   });

package/lib/cjs/components/modules/filter.js

@@ -27,7 +27,9 @@ var Filter = function Filter(props) {
     groupIndex = props.groupIndex;
   var store = (0, _useProvider.useStore)();
   var filter = meta.filter;
-  var notExistsColumns = store.preProps.notExistsColumns;
+  var _store$preProps = store.preProps,
+    notExistsColumns = _store$preProps.notExistsColumns,
+    otherTypes = _store$preProps.otherTypes;
   // const filterCustomType = store.filterCustomType;
   var index = (0, _utils.findIndex)(store.metaList[groupIndex].list, meta);
   // let notSelected = !meta.filter.length;
@@ -186,11 +188,8 @@ var Filter = function Filter(props) {
         groupIndex: groupIndex,
         children: (0, _jsxRuntime.jsx)("div", {
           className: "Sqb-item--content",
-          children: (0, _jsxRuntime.jsx)(_formulaList["default"]
-          // customTypes={customTypes}
-          // operatorList={operatorList}
-          , {
-            // customTypes={customTypes}
+          children: (0, _jsxRuntime.jsx)(_formulaList["default"], {
+            otherTypes: otherTypes,
             // operatorList={operatorList}
             value: filter,
             data: getPreColumns(),

package/lib/cjs/components/modules/join-data.js

@@ -1843,6 +1843,7 @@ var JoinData = function JoinData(props) {
                 }, i);
               }
               if (v.type === _types.AtomsTypeEnum.COLLECTION) {
+                var _store$preProps5;
                 return (0, _jsxRuntime.jsxs)("div", {
                   className: (0, _classnames["default"])(" Sqb-collection-box"),
                   children: [i == 0 && (0, _jsxRuntime.jsx)("span", {
@@ -1850,6 +1851,7 @@ var JoinData = function JoinData(props) {
                     children: "on"
                   }), (0, _jsxRuntime.jsx)(_dialog.FormulaList, {
                     _type: _types.FormulaTypeEnum.JOIN_DATA,
+                    otherTypes: (_store$preProps5 = store.preProps) === null || _store$preProps5 === void 0 ? void 0 : _store$preProps5.otherTypes,
                     // showPreview={false}
                     // check={formulaList?.[fun.name]?.args?.[i]?.check || ''}
                     value: v.list,

package/lib/cjs/types.d.ts

@@ -62,6 +62,7 @@ export interface MetabaseProps {
     }>;
     getExistsError?: (params: MetaListType[]) => Promise<any[]>;
     operatorList?: any[];
+    otherTypes?: any[];
 }
 export interface OptionItem {
     value?: string;

package/lib/es/components/dialog/custom-editor/index.js

@@ -15,15 +15,18 @@ import Styled from 'styled-components';
 import { FormulaTypeEnum } from '../../../store/types';
 import { Input, Toast } from '@gingkoo/pandora';
 import { isValidSQLAlias } from '../../../utils';
+import { useStore } from '../../../hooks/use-provider';
 var VisualBox = Styled.div.attrs({
   className: 'visual-box'
 })(_templateObject || (_templateObject = _taggedTemplateLiteral([""])));
 var CaseEditor = function CaseEditor(props) {
+  var _store$preProps;
   var value = props.value,
     data = props.data,
     exitData = props.exitData,
     onOk = props.onOk,
     onCancel = props.onCancel;
+  var store = useStore();
   // const [popup, setPopup] = useState<PopupType>({ visible: false }); // 弹框信息
   var _useState = useState(value.formulaList || []),
     _useState2 = _slicedToArray(_useState, 2),
@@ -83,6 +86,7 @@ var CaseEditor = function CaseEditor(props) {
             })]
           }), _jsx(FormulaList, {
             isCustom: true,
+            otherTypes: (_store$preProps = store.preProps) === null || _store$preProps === void 0 ? void 0 : _store$preProps.otherTypes,
             value: caseList,
             data: data,
             exitData: exitData,

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

@@ -178,7 +178,7 @@ var CaseEditor = React.forwardRef(function (props, ref) {
             })]
           }), fun === null || fun === void 0 || (_fun$args = fun.args) === null || _fun$args === void 0 ? void 0 : _fun$args.map(function (v, i) {
             if (v.type === AtomsTypeEnum.COLLECTION) {
-              var _formulaList$fun$name3;
+              var _store$preProps, _formulaList$fun$name3;
               return _jsxs("div", {
                 className: 'Sqb-item-formula-args',
                 children: [_jsxs("div", {
@@ -191,6 +191,7 @@ var CaseEditor = React.forwardRef(function (props, ref) {
                     },
                     children: ["\u53C2\u6570", i + 1, ":"]
                   }), _jsx(FormulaList, {
+                    otherTypes: (_store$preProps = store.preProps) === null || _store$preProps === void 0 ? void 0 : _store$preProps.otherTypes,
                     check: (formulaList === null || formulaList === void 0 || (_formulaList$fun$name3 = formulaList[fun.name]) === null || _formulaList$fun$name3 === void 0 || (_formulaList$fun$name3 = _formulaList$fun$name3.args) === null || _formulaList$fun$name3 === void 0 || (_formulaList$fun$name3 = _formulaList$fun$name3[i]) === null || _formulaList$fun$name3 === void 0 ? void 0 : _formulaList$fun$name3.check) || '',
                     value: v.list,
                     data: data,

package/lib/es/components/dialog/formula-list/index.d.ts

@@ -3,6 +3,7 @@ import './index.less';
 import { AtomsItem } from '../../../store/types';
 interface PropsType {
     customTypes?: any[];
+    otherTypes?: any[];
     operatorList?: string[];
     value: AtomsItem[];
     data: any;

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

@@ -60,6 +60,8 @@ var FormulaList = forwardRef(function (props, ref) {
     onChange = props.onChange,
     _props$customTypes = props.customTypes,
     _customTypes = _props$customTypes === void 0 ? customTypes : _props$customTypes,
+    _props$otherTypes = props.otherTypes,
+    otherTypes = _props$otherTypes === void 0 ? [] : _props$otherTypes,
     _props$isCustom = props.isCustom,
     isCustom = _props$isCustom === void 0 ? false : _props$isCustom,
     _props$showPreview = props.showPreview,
@@ -67,6 +69,26 @@ var FormulaList = forwardRef(function (props, ref) {
     check = props.check,
     _props$_type = props._type,
     _type = _props$_type === void 0 ? 'filter' : _props$_type;
+  var mergedTypes = useMemo(function () {
+    var map = new Map();
+    [].concat(_toConsumableArray(_customTypes), _toConsumableArray(otherTypes)).forEach(function (item) {
+      var _item$value;
+      var key = String((_item$value = item === null || item === void 0 ? void 0 : item.value) !== null && _item$value !== void 0 ? _item$value : '');
+      if (!key) return;
+      map.set(key, item);
+    });
+    return Array.from(map.values());
+  }, [_customTypes, otherTypes]);
+  var otherTypeMap = useMemo(function () {
+    var map = new Map();
+    (otherTypes || []).forEach(function (item) {
+      var _item$value2;
+      var key = String((_item$value2 = item === null || item === void 0 ? void 0 : item.value) !== null && _item$value2 !== void 0 ? _item$value2 : '');
+      if (!key) return;
+      map.set(key, item);
+    });
+    return map;
+  }, [otherTypes]);
   var _useState3 = useState(cloneDeep(value)),
     _useState4 = _slicedToArray(_useState3, 2),
     caseList = _useState4[0],
@@ -244,7 +266,7 @@ var FormulaList = forwardRef(function (props, ref) {
           value: option,
           children: option
         }, index + '' + ind);
-      }) : _customTypes.map(function (option, index) {
+      }) : mergedTypes.map(function (option, index) {
         return _jsx(Select.Option, {
           value: option.value,
           children: option.label
@@ -275,11 +297,17 @@ var FormulaList = forwardRef(function (props, ref) {
   // 常量
   var handleConstant = function handleConstant(val, i) {
     var _caseList = caseList.slice();
+    var currentItem = _caseList[i];
     var oldVal = _caseList[i].val;
     var oldType = _caseList[i].type;
+    var otherTypeConfig = otherTypeMap.get(String(oldType));
     if (oldType === AtomsTypeEnum.CONSTANT) {
       _caseList[i].id = val;
       _caseList[i].val = getConstantLabel(store.constantList, val);
+    } else if (otherTypeConfig) {
+      var sourceList = (currentItem === null || currentItem === void 0 ? void 0 : currentItem.list) || otherTypeConfig.list || [];
+      _caseList[i].id = val;
+      _caseList[i].val = getConstantLabel(sourceList, val);
     } else {
       _caseList[i].val = val;
     }
@@ -439,7 +467,12 @@ var FormulaList = forwardRef(function (props, ref) {
   var addOperator = function addOperator(type, index, position) {
     var _caseList = caseList.slice() || [];
     var _ind = index;
-    var temItem = getTemplateItem(type);
+    var otherTypeConfig = otherTypeMap.get(String(type));
+    var temItem = otherTypeConfig ? {
+      id: '',
+      val: '',
+      type: type
+    } : getTemplateItem(type);
     if (position === 'add') {
       _caseList.push(temItem);
       _ind = index + 1;
@@ -563,13 +596,17 @@ var FormulaList = forwardRef(function (props, ref) {
     var node = e.currentTarget;
     var _ind = Number(node.getAttribute('v-index'));
     var _val = node.getAttribute('v-val');
+    var _type = node.getAttribute('v-type') || '';
+    var currentItem = caseList[_ind];
+    var otherTypeConfig = otherTypeMap.get(_type);
+    var listSource = (currentItem === null || currentItem === void 0 ? void 0 : currentItem.list) || (otherTypeConfig === null || otherTypeConfig === void 0 ? void 0 : otherTypeConfig.list) || store.constantList || [];
     store.setPopup({
       visible: true,
       node: e.currentTarget,
       container: ref === null || ref === void 0 ? void 0 : ref.current,
       content: _jsx(SelectList, {
         value: _val,
-        list: store.constantList || [],
+        list: listSource,
         onChange: function onChange(val) {
           closePopup();
           handleConstant(val, _ind);
@@ -777,6 +814,32 @@ var FormulaList = forwardRef(function (props, ref) {
           })]
         })
       }, index);
+    } else if (otherTypeMap.has(String(type))) {
+      // 业务自定义常量类型（otherTypes）
+      var currentOtherType = otherTypeMap.get(String(type));
+      var listSource = (currentOtherType === null || currentOtherType === void 0 ? void 0 : currentOtherType.list) || [];
+      return _jsx(ItemName, {
+        isError: !!(v.id || v.val) && !getConstantLabel(listSource, v.id || v.val),
+        message: "\u5E38\u91CF\u4E22\u5931",
+        children: _jsxs("div", {
+          className: cx("Sqb-TableName", {
+            notSelected: !v.val
+          }),
+          "v-index": index,
+          "v-val": v.id || v.val,
+          "v-type": type,
+          onClick: selectConstant,
+          children: [getConstantLabel(listSource, v.id || v.val, v.val) || "\u8BF7\u9009\u62E9".concat(currentOtherType.label), _jsx("span", {
+            style: {
+              fontSize: 0
+            },
+            onClick: function onClick(e) {
+              return handleDel(e, index);
+            },
+            children: _jsx(CloseIcon, {})
+          })]
+        })
+      }, index);
     } else if (type === AtomsTypeEnum.EXPRESSION) {
       if (~['早于', '晚于', '在'].indexOf(v.condition) && v.rhs.length > 1) {
         var _caseList$index$quote;

package/lib/es/components/modules/components/meta-icon.js

@@ -372,10 +372,26 @@ var NextDom = function NextDom(props) {
       className: "Sqb-item--func",
       children: sortList(available).filter(function (v) {
         return ~store.toolbar.indexOf(v);
-      }).map(function (v) {
-        return _jsx(MetaIconDom, {
-          type: v
-        }, v);
+      }).map(function (v, idx) {
+        var info = IconTypeMap.get(v);
+        return _jsx(Tooltip, {
+          title: size === IconSIzeEnum.SMALL ? info.name : '',
+          placement: 'top',
+          children: _jsx("button", {
+            className: cx("Sqb-button ".concat(info.className || ''), {
+              small: size === IconSIzeEnum.SMALL,
+              large: size === IconSIzeEnum.LARGE
+            }),
+            onClick: function onClick() {
+              return handleClick(v);
+            },
+            children: _jsxs("div", {
+              children: [info.icon, size === IconSIzeEnum.LARGE ? _jsx("div", {
+                children: info.name
+              }) : '']
+            })
+          })
+        }, "".concat(String(v), "-").concat(idx));
       })
     })]
   });

package/lib/es/components/modules/filter.js

@@ -19,7 +19,9 @@ var Filter = function Filter(props) {
     groupIndex = props.groupIndex;
   var store = useStore();
   var filter = meta.filter;
-  var notExistsColumns = store.preProps.notExistsColumns;
+  var _store$preProps = store.preProps,
+    notExistsColumns = _store$preProps.notExistsColumns,
+    otherTypes = _store$preProps.otherTypes;
   // const filterCustomType = store.filterCustomType;
   var index = findIndex(store.metaList[groupIndex].list, meta);
   // let notSelected = !meta.filter.length;
@@ -178,11 +180,8 @@ var Filter = function Filter(props) {
         groupIndex: groupIndex,
         children: _jsx("div", {
           className: "Sqb-item--content",
-          children: _jsx(FormulaList
-          // customTypes={customTypes}
-          // operatorList={operatorList}
-          , {
-            // customTypes={customTypes}
+          children: _jsx(FormulaList, {
+            otherTypes: otherTypes,
             // operatorList={operatorList}
             value: filter,
             data: getPreColumns(),

package/lib/es/components/modules/join-data.js

@@ -1838,6 +1838,7 @@ var JoinData = function JoinData(props) {
                 }, i);
               }
               if (v.type === AtomsTypeEnum.COLLECTION) {
+                var _store$preProps5;
                 return _jsxs("div", {
                   className: cx(" Sqb-collection-box"),
                   children: [i == 0 && _jsx("span", {
@@ -1845,6 +1846,7 @@ var JoinData = function JoinData(props) {
                     children: "on"
                   }), _jsx(FormulaList, {
                     _type: FormulaTypeEnum.JOIN_DATA,
+                    otherTypes: (_store$preProps5 = store.preProps) === null || _store$preProps5 === void 0 ? void 0 : _store$preProps5.otherTypes,
                     // showPreview={false}
                     // check={formulaList?.[fun.name]?.args?.[i]?.check || ''}
                     value: v.list,

package/lib/es/types.d.ts

@@ -62,6 +62,7 @@ export interface MetabaseProps {
     }>;
     getExistsError?: (params: MetaListType[]) => Promise<any[]>;
     operatorList?: any[];
+    otherTypes?: any[];
 }
 export interface OptionItem {
     value?: string;

package/package.json

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