@gingkoo/pandora-metabase 1.0.14 → 1.0.16

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

@@ -1,11 +1,4 @@
-export declare enum OptionsTypeEnum {
-    NOT_EXISTS = "notExists",// 输入框
-    INPUT = "input",// 输入框
-    FIELD = "field",// 字段
-    OPERATOR = "operator",// 运算符
-    EXPRESSION = "expression",// 公式
-    OTHER = "other"
-}
+import { AtomsTypeEnum } from '../../../store/types';
 export declare enum FunctionEnum {
     LOWER = "lower",
     UPPER = "upper",
@@ -35,9 +28,12 @@ export declare enum FunctionEnum {
     'COALESCE' = "coalesce"
 }
 export declare const operatorList: string[];
-export declare const otherList: string[];
-export declare const functionList: string[];
-export declare const customTypes: {
-    value: OptionsTypeEnum;
+export declare const customTypes: ({
+    value: AtomsTypeEnum;
+    label: any;
+    children?: undefined;
+} | {
+    value: AtomsTypeEnum;
     label: any;
-}[];
+    children: string[];
+})[];

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

@@ -3,18 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.otherList = exports.operatorList = exports.functionList = exports.customTypes = exports.OptionsTypeEnum = exports.FunctionEnum = void 0;
+exports.operatorList = exports.customTypes = exports.FunctionEnum = void 0;
 var _locale = require("../../../locale");
-var OptionsTypeEnum;
-(function (OptionsTypeEnum) {
-  // CONSTANT = 'constant', // 常量
-  OptionsTypeEnum["NOT_EXISTS"] = "notExists";
-  OptionsTypeEnum["INPUT"] = "input";
-  OptionsTypeEnum["FIELD"] = "field";
-  OptionsTypeEnum["OPERATOR"] = "operator";
-  OptionsTypeEnum["EXPRESSION"] = "expression";
-  OptionsTypeEnum["OTHER"] = "other";
-})(OptionsTypeEnum || (exports.OptionsTypeEnum = OptionsTypeEnum = {}));
+var _types = require("../../../store/types");
+// export enum OptionsTypeEnum {
+//   // CONSTANT = 'constant', // 常量
+//   NOT_EXISTS = 'notExists', // 输入框
+//   INPUT = 'input', // 输入框
+//   FIELD = 'field', // 字段
+//   OPERATOR = 'operator', // 运算符
+//   EXPRESSION = 'expression', // 公式
+//   OTHER = 'other', //  其他
+// }
 var FunctionEnum;
 (function (FunctionEnum) {
   FunctionEnum["LOWER"] = "lower";
@@ -47,33 +47,77 @@ var FunctionEnum;
   // OTHER
   FunctionEnum["COALESCE"] = "coalesce";
 })(FunctionEnum || (exports.FunctionEnum = FunctionEnum = {}));
-var operatorList = exports.operatorList = ['+', '-', '*', '/', '!=', '<=', '>=', '<', '>', '=', 'not', 'and', 'or', '(', ')', ',', 'DESC', 'ASC', 'OVER', 'PARTITION BY', 'ORDER BY'];
-var otherList = exports.otherList = ['case', 'when', 'then', 'else', 'end', 'RANK()', 'DENSE_RANK()', 'ROW_NUMBER()'];
-var functionList = exports.functionList = ['lower', 'upper', 'substring', 'regex-match-first', 'concat', 'replace', 'trim', 'rtrim', 'ltrim', 'length',
-// number
-'abs', 'floor', 'ceil', 'round', 'sqrt', 'power', 'log', 'exp',
-// boolean
-'contains', 'ends-with', 'starts-with', 'between', 'time-interval', 'is-null', 'is-empty',
-// other
-'coalesce'];
-var customTypes = exports.customTypes = [{
-  value: OptionsTypeEnum.FIELD,
+var operatorList = exports.operatorList = ['and', 'or', '(', ')', ',', '+', '-', '*', '/', '!=', '<=', '>=', '<', '>', '=', 'case', 'when', 'then', 'else', 'end', 'DESC', 'ASC', 'OVER', 'PARTITION BY', 'ORDER BY', 'RANK()', 'DENSE_RANK()', 'ROW_NUMBER()'];
+// export const otherList = [
+//   'case',
+//   'when',
+//   'then',
+//   'else',
+//   'end',
+//   'RANK()',
+//   'DENSE_RANK()',
+//   'ROW_NUMBER()',
+// ];
+// export const functionList = [
+//   'lower',
+//   'upper',
+//   'substring',
+//   'regex-match-first',
+//   'concat',
+//   'replace',
+//   'trim',
+//   'rtrim',
+//   'ltrim',
+//   'length',
+//   // number
+//   'abs',
+//   'floor',
+//   'ceil',
+//   'round',
+//   'sqrt',
+//   'power',
+//   'log',
+//   'exp',
+//   // boolean
+//   'contains',
+//   'ends-with',
+//   'starts-with',
+//   'between',
+//   'time-interval',
+//   'is-null',
+//   'is-empty',
+//   // other
+//   'coalesce',
+// ];
+var customTypes = exports.customTypes = [
+// 字段
+{
+  value: _types.AtomsTypeEnum.FIELD,
   label: (0, _locale.__)('customColumn.field')
-}, {
-  value: OptionsTypeEnum.INPUT,
-  label: (0, _locale.__)('SqlQueryBuilder.input')
-}, {
-  value: OptionsTypeEnum.OPERATOR,
-  label: (0, _locale.__)('customColumn.operator')
-}, {
-  value: OptionsTypeEnum.EXPRESSION,
+},
+// 表达式
+{
+  value: _types.AtomsTypeEnum.EXPRESSION,
   label: (0, _locale.__)('customColumn.expression')
-}, {
-  value: OptionsTypeEnum.OTHER,
-  label: (0, _locale.__)('customColumn.other')
-}
-// {
-//   value: OptionsTypeEnum.NOT_EXISTS,
-//   label: 'NOT_EXISTS',
-// },
-];
+},
+// 输入框
+{
+  value: _types.AtomsTypeEnum.INPUT_STRING,
+  label: (0, _locale.__)('SqlQueryBuilder.input')
+},
+// 数字输入框
+{
+  value: _types.AtomsTypeEnum.INPUT_NUMBER,
+  label: (0, _locale.__)('SqlQueryBuilder.numberInput')
+},
+// 数字输入框
+{
+  value: _types.AtomsTypeEnum.CONSTANT,
+  label: (0, _locale.__)('customColumn.constant')
+},
+// 连接符
+{
+  value: _types.AtomsTypeEnum.OPERATOR,
+  label: (0, _locale.__)('customColumn.operator'),
+  children: operatorList
+}];

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

@@ -1,6 +1,9 @@
 import React from 'react';
+import { AtomsItem } from '../../../store/types';
 interface PropsType {
-    value: any[];
+    customTypes?: any[];
+    operatorList?: string[];
+    value: AtomsItem[];
     data: any;
     exitData?: any;
     isCustom?: boolean;

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

@@ -17,13 +17,15 @@ var _locale = require("../../../locale");
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _utils = require("./utils");
 var _enum = require("./enum");
+var _types = require("../../../store/types");
+var _enum2 = require("../../../store/enum");
 var _pandora = require("@gingkoo/pandora");
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 var _helper = require("../../../store/helper");
-var _helper2 = require("../../../utils/helper");
 var _utils2 = require("../../../utils");
 var _icons = require("../../icons");
 var _dialog = require("../../dialog");
+var _selectList = _interopRequireDefault(require("../../dialog/select-list"));
 var _arrow = _interopRequireDefault(require("./arrow.svg"));
 var _useProvider = require("../../../hooks/use-provider");
 var _excluded = ["notExistsToolbar", "toolbar"]; // import './index.less';
@@ -32,7 +34,11 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     data = props.data,
     isCustom = props.isCustom,
     exitData = props.exitData,
-    onChange = props.onChange;
+    onChange = props.onChange,
+    _props$customTypes = props.customTypes,
+    _customTypes = _props$customTypes === void 0 ? _enum.customTypes : _props$customTypes,
+    _props$operatorList = props.operatorList,
+    _operatorList = _props$operatorList === void 0 ? _enum.operatorList : _props$operatorList;
   var _useState = (0, _react.useState)(value || []),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     caseList = _useState2[0],
@@ -46,17 +52,8 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     setInd = _useState4[1];
   var store = (0, _useProvider.useStore)();
   var filterCustomType = store.filterCustomType;
-  var filterCase = (0, _react.useMemo)(function () {
+  (0, _react.useEffect)(function () {
     onChange === null || onChange === void 0 || onChange(caseList);
-    var hasCase = caseList.some(function (item) {
-      return item.type === _enum.OptionsTypeEnum.OTHER && item.operator === 'case';
-    });
-    if (hasCase) {
-      return _enum.otherList.filter(function (item) {
-        return item !== 'case';
-      });
-    }
-    return _enum.otherList;
   }, [caseList]);
   function closePopup() {
     store.setPopup({
@@ -69,20 +66,14 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
       visible: true,
       node: e.currentTarget,
       container: ref === null || ref === void 0 ? void 0 : ref.current,
-      content: (0, _jsxRuntime.jsx)(_dialog.SelectJoinColumn, {
+      content: (0, _jsxRuntime.jsx)(_dialog.SelectColumnMultiple, {
         data: data,
-        value: val,
-        // theme={ColumnsPopupThemeEnum.greenGrass}
-        isGroup: true,
-        // @ts-ignore
-        onGroup: function onGroup(data) {
-          var _data = (0, _cloneDeep["default"])(data);
-          if (_data.alias != _helper.SummarizeAlias) {
-            _data.fieldAlias = _data.name;
-            _data.fieldUuid = (0, _helper2.uuidv4)('field');
-          }
+        multiple: false,
+        value: [val],
+        theme: _enum2.ColumnsPopupThemeEnum.skyBlue,
+        onSelect: function onSelect(fields, quotes) {
           var _caseList = caseList.slice();
-          _caseList[i].expression = _data;
+          _caseList[i] = fields[0];
           setCaseList(_caseList);
           closePopup();
         }
@@ -92,8 +83,8 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
   // 常量
   var handleConstant = function handleConstant(val, i) {
     var _caseList = caseList.slice();
-    var oldType = _caseList[i].operator;
-    _caseList[i].operator = val;
+    var oldType = _caseList[i].val;
+    _caseList[i].val = val;
     _caseList = (0, _utils.getTemplate)(oldType, val, _caseList, i);
     setCaseList(_caseList);
   };
@@ -103,20 +94,14 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
       visible: true,
       node: e.currentTarget,
       container: ref === null || ref === void 0 ? void 0 : ref.current,
-      content: (0, _jsxRuntime.jsx)(_dialog.SelectFilter, {
-        isCustom: isCustom,
+      content: (0, _jsxRuntime.jsx)(_dialog.Expression, {
         filterCustomType: filterCustomType,
-        container: ref === null || ref === void 0 ? void 0 : ref.current,
         data: data,
-        value: val,
+        container: ref === null || ref === void 0 ? void 0 : ref.current,
+        value: val || {},
         onChange: function onChange(data) {
-          var _data = (0, _cloneDeep["default"])(data);
-          if (_data.alias != _helper.SummarizeAlias) {
-            _data.fieldAlias = _data.name;
-            _data.fieldUuid = (0, _helper2.uuidv4)('field');
-          }
           var _caseList = caseList.slice();
-          _caseList[i].expression = _data;
+          _caseList[i] = data;
           setCaseList(_caseList);
           closePopup();
         }
@@ -132,13 +117,9 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     closePopup();
   }
   // 添加
-  var addOperator = function addOperator(val, index, position) {
+  var addOperator = function addOperator(type, index, position) {
     var _caseList = caseList.slice() || [];
-    var temItem = {
-      operator: '',
-      type: val,
-      expression: ''
-    };
+    var temItem = (0, _helper.getTemItem)(type);
     if (position === 'add') {
       _caseList.push(temItem);
     } else if (position === 'before') {
@@ -158,14 +139,14 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
       notExistsToolbar = _store$preProps.notExistsToolbar,
       toolbar = _store$preProps.toolbar,
       other = (0, _objectWithoutProperties2["default"])(_store$preProps, _excluded);
-    var _value = ((_caseList$i = caseList[i]) === null || _caseList$i === void 0 || (_caseList$i = _caseList$i.expression) === null || _caseList$i === void 0 ? void 0 : _caseList$i.notExists) || [];
-    var oldList = (0, _cloneDeep["default"])(((_caseList$i2 = caseList[i]) === null || _caseList$i2 === void 0 || (_caseList$i2 = _caseList$i2.expression) === null || _caseList$i2 === void 0 ? void 0 : _caseList$i2.notExists) || []);
+    var _value = ((_caseList$i = caseList[i]) === null || _caseList$i === void 0 ? void 0 : _caseList$i.notExists) || [];
+    var oldList = (0, _cloneDeep["default"])(((_caseList$i2 = caseList[i]) === null || _caseList$i2 === void 0 ? void 0 : _caseList$i2.notExists) || []);
     var _toolbar = notExistsToolbar || toolbar;
     _toolbar = _toolbar.filter(function (v) {
       return v !== 'group';
     }); // 子查询不需要分组
     var o = _pandora.Modal2.openModal({
-      title: 'NOT EXISTS',
+      title: caseList[i].type,
       transparentMask: true,
       content: (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
         children: (0, _jsxRuntime.jsx)(_index["default"], (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, other), {}, {
@@ -184,24 +165,10 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
               }
               var expression = {
                 notExists: (0, _cloneDeep["default"])(newList),
-                quotes: (0, _utils2.buildSqlQuery)(newList, 'NOT EXISTS'),
-                condition: '',
-                table: '',
-                tableId: '',
-                fieldUuid: (0, _helper2.uuidv4)('field'),
-                //  字段唯一id
-                fieldAlias: '',
-                //字段别名
-                tableUuid: (0, _helper2.uuidv4)('table'),
-                alias: '',
-                name: '',
-                id: '',
-                database_type: '',
-                val: [],
-                datasourceId: '',
-                datasourceName: ''
+                quotes: (0, _utils2.buildSqlQuery)(newList, caseList[i].type),
+                type: caseList[i].type
               };
-              caseList[i].expression = expression;
+              caseList[i] = expression;
               onChange === null || onChange === void 0 || onChange(caseList);
               setCaseList((0, _toConsumableArray2["default"])(caseList));
               o.close();
@@ -216,16 +183,34 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
       onClose: function onClose() {}
     });
   };
+  function selectConstant(e) {
+    var node = e.currentTarget;
+    var _ind = Number(node.getAttribute('v-index'));
+    var _val = node.getAttribute('v-val');
+    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 || [],
+        onChange: function onChange(val) {
+          closePopup();
+          handleConstant(val, _ind);
+        }
+      })
+    });
+  }
   // 分段
   var itemDom = function itemDom(v, index) {
     var type = v.type;
-    if (v.type === _enum.OptionsTypeEnum.NOT_EXISTS) {
+    if (v.type === _types.AtomsTypeEnum.NOT_EXISTS || v.type === _types.AtomsTypeEnum.EXISTS) {
       return (0, _jsxRuntime.jsxs)("div", {
         className: "Sqb-TableName purple-name",
         onClick: function onClick(e) {
           return showNotExists(index);
         },
-        children: ["not exitis ( * )", (0, _jsxRuntime.jsx)("span", {
+        children: [v.type, " ( * )", (0, _jsxRuntime.jsx)("span", {
           style: {
             fontSize: 0
           },
@@ -235,17 +220,16 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
           children: (0, _jsxRuntime.jsx)(_icons.CloseIcon, {})
         })]
       }, index);
-    } else if (type === _enum.OptionsTypeEnum.FIELD) {
-      var _v$expression, _v$expression2;
+    } else if (type === _types.AtomsTypeEnum.FIELD) {
       // 字段
       return (0, _jsxRuntime.jsxs)("div", {
         className: (0, _classnames["default"])("Sqb-TableName ", {
-          notSelected: !((_v$expression = v.expression) !== null && _v$expression !== void 0 && _v$expression.quotes)
+          notSelected: !(v !== null && v !== void 0 && v.fieldName)
         }),
         onClick: function onClick(e) {
-          return handleField(e, index, v.expression);
+          return handleField(e, index, v);
         },
-        children: [!((_v$expression2 = v.expression) !== null && _v$expression2 !== void 0 && _v$expression2.quotes) && (0, _locale.__)('customColumn.selectField'), v.expression.quotes, (0, _jsxRuntime.jsx)("span", {
+        children: [!(v !== null && v !== void 0 && v.fieldName) && (0, _locale.__)('customColumn.selectField'), v.fieldName, (0, _jsxRuntime.jsx)("span", {
           style: {
             fontSize: 0
           },
@@ -255,13 +239,13 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
           children: (0, _jsxRuntime.jsx)(_icons.CloseIcon, {})
         })]
       });
-    } else if (type === _enum.OptionsTypeEnum.INPUT) {
+    } else if (type === _types.AtomsTypeEnum.INPUT_STRING) {
       // 输入框
       return (0, _jsxRuntime.jsxs)("div", {
         className: (0, _classnames["default"])("Sqb-TableName notSelected "),
         children: [(0, _jsxRuntime.jsx)(_pandora.Input, {
           className: ':Sqb-Custom-input',
-          value: v.operator,
+          value: v.val,
           placeholder: (0, _locale.__)('SqlQueryBuilder.pleaseEnter'),
           size: 'large',
           onChange: function onChange(val) {
@@ -277,19 +261,41 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
           children: (0, _jsxRuntime.jsx)(_icons.CloseIcon, {})
         })]
       });
-    } else if (type === _enum.OptionsTypeEnum.OPERATOR) {
+    } else if (type === _types.AtomsTypeEnum.INPUT_NUMBER) {
+      // 输入框
+      return (0, _jsxRuntime.jsxs)("div", {
+        className: (0, _classnames["default"])("Sqb-TableName notSelected "),
+        children: [(0, _jsxRuntime.jsx)(_pandora.InputNumber, {
+          className: ':sqb-Custom-input',
+          value: v.val,
+          placeholder: (0, _locale.__)('SqlQueryBuilder.pleaseEnter'),
+          size: 'large',
+          onChange: function onChange(val) {
+            handleConstant(val, index);
+          }
+        }), (0, _jsxRuntime.jsx)("span", {
+          style: {
+            fontSize: 0
+          },
+          onClick: function onClick(e) {
+            return handleDel(e, index);
+          },
+          children: (0, _jsxRuntime.jsx)(_icons.CloseIcon, {})
+        })]
+      });
+    } else if (type === _types.AtomsTypeEnum.OPERATOR) {
       //连接符
       return (0, _jsxRuntime.jsx)(_pandora.Select, {
         triggerProps: {
           clickToClose: true
         },
-        value: v.operator,
+        value: v.val,
         triggerElement: function triggerElement(value) {
           return (0, _jsxRuntime.jsxs)("div", {
             className: (0, _classnames["default"])("Sqb-TableName Sqb-TableName-OPERATOR", {
-              notSelected: !v.operator
+              notSelected: !v.val
             }),
-            children: [!v.operator && (0, _locale.__)('customColumn.selectOperator'), v.operator, (0, _jsxRuntime.jsx)("span", {
+            children: [!v.val && (0, _locale.__)('customColumn.selectOperator'), v.val, (0, _jsxRuntime.jsx)("span", {
               style: {
                 fontSize: 0
               },
@@ -303,24 +309,34 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
         onChange: function onChange(val) {
           handleConstant(val, index);
         },
-        children: _enum.operatorList.map(function (option, index) {
+        children: _operatorList.map(function (option, index) {
           return (0, _jsxRuntime.jsx)(_pandora.Select.Option, {
             value: option,
             children: option
           }, index + '' + ind);
         })
       });
-    } else if (type === _enum.OptionsTypeEnum.EXPRESSION) {
-      var _v$expression3;
+    } else if (type === _types.AtomsTypeEnum.CONSTANT) {
+      //常量
+      return (0, _jsxRuntime.jsx)("div", {
+        className: (0, _classnames["default"])("Sqb-TableName", {
+          notSelected: !v.val
+        }),
+        "v-index": index,
+        "v-val": v.val,
+        onClick: selectConstant,
+        children: v.val ? v.val : (0, _locale.__)('SqlQueryBuilder.pickConstant')
+      }, index);
+    } else if (type === _types.AtomsTypeEnum.EXPRESSION) {
       // 表达式
       return (0, _jsxRuntime.jsxs)("div", {
         className: (0, _classnames["default"])("Sqb-TableName purple-name", {
-          notSelected: !((_v$expression3 = v.expression) !== null && _v$expression3 !== void 0 && _v$expression3.quotes)
+          notSelected: !v.quotes
         }),
         onClick: function onClick(e) {
-          return handleExpression(e, index, v.expression);
+          return handleExpression(e, index, v);
         },
-        children: [!v.expression.quotes && (0, _locale.__)('customColumn.selectExpression'), v.expression.quotes, (0, _jsxRuntime.jsx)("span", {
+        children: [!v.quotes && (0, _locale.__)('customColumn.selectExpression'), v.quotes, (0, _jsxRuntime.jsx)("span", {
           style: {
             fontSize: 0
           },
@@ -330,45 +346,12 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
           children: (0, _jsxRuntime.jsx)(_icons.CloseIcon, {})
         })]
       });
-    } else if (type === _enum.OptionsTypeEnum.OTHER) {
-      // 其他
-      return (0, _jsxRuntime.jsx)(_pandora.Select, {
-        triggerProps: {
-          clickToClose: true
-        },
-        value: v.operator,
-        triggerElement: function triggerElement(value) {
-          return (0, _jsxRuntime.jsxs)("div", {
-            className: (0, _classnames["default"])("Sqb-TableName Sqb-TableName-OTHER", {
-              notSelected: !v.operator
-            }),
-            children: [!v.operator && (0, _locale.__)('customColumn.selectOtherSyntax'), v.operator, (0, _jsxRuntime.jsx)("span", {
-              style: {
-                fontSize: 0
-              },
-              onClick: function onClick(e) {
-                return handleDel(e, index);
-              },
-              children: (0, _jsxRuntime.jsx)(_icons.CloseIcon, {})
-            })]
-          });
-        },
-        onChange: function onChange(val) {
-          handleConstant(val, index);
-        },
-        children: filterCase.map(function (option, index) {
-          return (0, _jsxRuntime.jsx)(_pandora.Select.Option, {
-            value: option,
-            children: option
-          }, index + '' + ind);
-        })
-      });
     } else {
       return (0, _jsxRuntime.jsx)(_pandora.Select, {
         triggerProps: {
           clickToClose: true
         },
-        value: v.operator,
+        value: v.val,
         triggerElement: function triggerElement(value) {
           return (0, _jsxRuntime.jsxs)("div", {
             className: (0, _classnames["default"])("Sqb-TableName ", {
@@ -388,7 +371,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
         onChange: function onChange(val) {
           addOperator(val, index, '');
         },
-        children: _enum.customTypes.map(function (option, index) {
+        children: _customTypes.map(function (option, index) {
           return (0, _jsxRuntime.jsx)(_pandora.Select.Option, {
             value: option.value,
             children: option.label
@@ -425,7 +408,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
                 "v-index": i,
                 "v-type": 'before',
                 onClick: function onClick() {
-                  addOperator('', i, 'before');
+                  addOperator(_types.AtomsTypeEnum.UNKNOWN, i, 'before');
                 },
                 children: (0, _jsxRuntime.jsx)("img", {
                   src: _arrow["default"]
@@ -435,7 +418,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
             onChange: function onChange(val) {
               addOperator(val, i, 'before');
             },
-            children: _enum.customTypes.map(function (option, index) {
+            children: _customTypes.map(function (option, index) {
               return (0, _jsxRuntime.jsx)(_pandora.Select.Option, {
                 value: option.value,
                 children: option.label
@@ -462,7 +445,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
                 "v-index": i,
                 "v-type": 'after',
                 onClick: function onClick() {
-                  addOperator('', i, 'after');
+                  addOperator(_types.AtomsTypeEnum.UNKNOWN, i, 'after');
                 },
                 children: (0, _jsxRuntime.jsx)("img", {
                   src: _arrow["default"]
@@ -472,7 +455,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
             onChange: function onChange(val, option) {
               addOperator(val, i, 'after');
             },
-            children: _enum.customTypes.map(function (option, index) {
+            children: _customTypes.map(function (option, index) {
               return (0, _jsxRuntime.jsx)(_pandora.Select.Option, {
                 value: option.value,
                 children: option.label
@@ -480,7 +463,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
             })
           })]
         }, i);
-      }), !value || Array.from(caseList).length < 1 && (0, _jsxRuntime.jsx)(_pandora.Select, {
+      }), Array.from(caseList).length < 1 && (0, _jsxRuntime.jsx)(_pandora.Select, {
         trigger: 'click',
         triggerProps: {
           clickToClose: true
@@ -497,7 +480,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
         onChange: function onChange(val) {
           addOperator(val, -1, 'add');
         },
-        children: _enum.customTypes.map(function (option, index) {
+        children: _customTypes.map(function (option, index) {
           return (0, _jsxRuntime.jsx)(_pandora.Select.Option, {
             value: option.value,
             children: option.label
@@ -507,11 +490,12 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     }), (0, _jsxRuntime.jsxs)("p", {
       className: 'Sqb-NotebookCell-preview',
       children: ["\u9884\u89C8\uFF1A", caseList.map(function (v, i) {
-        if (v.expression) {
-          var _v$expression4;
-          return v === null || v === void 0 || (_v$expression4 = v.expression) === null || _v$expression4 === void 0 ? void 0 : _v$expression4.quotes;
+        if (v !== null && v !== void 0 && v.quotes) {
+          return v === null || v === void 0 ? void 0 : v.quotes;
+        } else if (v !== null && v !== void 0 && v.fieldName) {
+          return v === null || v === void 0 ? void 0 : v.fieldName;
         } else {
-          return v.operator;
+          return v.val;
         }
       }).join(' ')]
     })]