@gingkoo/pandora-metabase 1.0.91 → 1.0.93

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

@@ -80,7 +80,7 @@ var CaseEditor = _react["default"].forwardRef(function (props, ref) {
   // 确定
   var _onOk = function _onOk() {
     typeof onOk === 'function' && (onOk === null || onOk === void 0 ? void 0 : onOk((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, fun), {}, {
-      quotes: getQuotes(fun.args)
+      quotes: (0, _utils2.getQuotes)(fun, fun.args, formulaList)
     })));
   };
   // 选择公式名
@@ -95,21 +95,6 @@ var CaseEditor = _react["default"].forwardRef(function (props, ref) {
       name: formulaList === null || formulaList === void 0 || (_formulaList$id3 = formulaList[id]) === null || _formulaList$id3 === void 0 ? void 0 : _formulaList$id3.name
     }));
   };
-  var getQuotes = function getQuotes(_args) {
-    var quotes = _args.map(function (v) {
-      var quotes = v.list.map(function (vv, i) {
-        if (vv !== null && vv !== void 0 && vv.quotes) {
-          return vv === null || vv === void 0 ? void 0 : vv.quotes;
-        } else if (vv !== null && vv !== void 0 && vv.fieldName) {
-          return vv === null || vv === void 0 ? void 0 : vv.fieldName;
-        } else {
-          return vv.val;
-        }
-      }).join(' ');
-      return quotes;
-    }).join(' , ');
-    return fun.name + ' ( ' + quotes + ' ) ';
-  };
   var addParams = function addParams(index) {
     var _args = (0, _cloneDeep["default"])(fun.args);
     var tem = (0, _utils2.getTemArgs)(formulaList === null || formulaList === void 0 ? void 0 : formulaList[fun.name].args)[index + 1] || {
@@ -118,7 +103,7 @@ var CaseEditor = _react["default"].forwardRef(function (props, ref) {
     };
     _args.splice(index + 1, 0, tem);
     setFun((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, fun), {}, {
-      quotes: getQuotes(_args),
+      quotes: (0, _utils2.getQuotes)(fun, _args, formulaList),
       args: _args
     }));
   };
@@ -126,7 +111,7 @@ var CaseEditor = _react["default"].forwardRef(function (props, ref) {
     var _args = (0, _cloneDeep["default"])(fun.args);
     _args.splice(index, 1);
     setFun((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, fun), {}, {
-      quotes: getQuotes(_args),
+      quotes: (0, _utils2.getQuotes)(fun, _args, formulaList),
       args: _args
     }));
   };
@@ -155,11 +140,12 @@ var CaseEditor = _react["default"].forwardRef(function (props, ref) {
                 },
                 value: fun.id || fun.name,
                 triggerElement: function triggerElement(value) {
+                  var _formulaList$fun$id;
                   return (0, _jsxRuntime.jsx)("div", {
                     className: (0, _classnames["default"])("Sqb-TableName Sqb-TableName-OPERATOR", {
                       notSelected: !fun.name
                     }),
-                    children: fun.name ? fun.name : (0, _locale.__)('customColumn.selectFormula')
+                    children: fun.id ? (_formulaList$fun$id = formulaList[fun.id]) === null || _formulaList$fun$id === void 0 ? void 0 : _formulaList$fun$id.name : (0, _locale.__)('customColumn.selectFormula')
                   });
                 },
                 onChange: function onChange(val) {
@@ -222,7 +208,7 @@ var CaseEditor = _react["default"].forwardRef(function (props, ref) {
                       //   })
                       //   .join(' , ');
                       setFun((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, fun), {}, {
-                        quotes: getQuotes(_args),
+                        quotes: (0, _utils2.getQuotes)(fun, _args, formulaList),
                         //fun.name + ' ( ' + quotes + ' ) ',
                         args: _args
                       }));

package/lib/cjs/components/dialog/formula/utils.d.ts

@@ -5,3 +5,4 @@ export declare function getParamActions(params: AtomsItem[], arity?: Arity): {
     canAdd: boolean;
     canDel: boolean;
 };
+export declare const getQuotes: (fun: any, _args: AtomsItem[], formulaList: any) => string;

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

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getObjTem = void 0;
 exports.getParamActions = getParamActions;
-exports.getTemArgs = void 0;
+exports.getTemArgs = exports.getQuotes = void 0;
 var _types = require("../../../store/types");
 var _utils = require("../formula-list/utils");
 var getObjTem = exports.getObjTem = function getObjTem(arr) {
@@ -63,4 +63,20 @@ function getParamActions(params, arity) {
     // 小于 max 才能加
     canDel: len > effectiveMin // 大于 min 才能删
   };
-}
+}
+var getQuotes = exports.getQuotes = function getQuotes(fun, _args, formulaList) {
+  var _formulaList$fun$id;
+  var quotes = _args === null || _args === void 0 ? void 0 : _args.map(function (v) {
+    var quotes = v.list.map(function (vv, i) {
+      if (vv !== null && vv !== void 0 && vv.quotes) {
+        return vv === null || vv === void 0 ? void 0 : vv.quotes;
+      } else if (vv !== null && vv !== void 0 && vv.fieldName) {
+        return vv === null || vv === void 0 ? void 0 : vv.fieldName;
+      } else {
+        return vv.val;
+      }
+    }).join(' ');
+    return quotes;
+  }).join(' , ');
+  return ((_formulaList$fun$id = formulaList[fun.id]) === null || _formulaList$fun$id === void 0 ? void 0 : _formulaList$fun$id.name) + ' ( ' + quotes + ' ) ';
+};

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

@@ -20,15 +20,16 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _index2 = _interopRequireDefault(require("../../../index"));
 var _locale = require("../../../locale");
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
+var _utils = require("../formula/utils");
 var _types = require("../../../store/types");
 var _enum = require("../../../store/enum");
 var _pandora = require("@gingkoo/pandora");
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
-var _utils = require("../../../utils");
+var _utils2 = require("../../../utils");
 var _formula = _interopRequireDefault(require("../formula"));
 var _icons = require("../../icons");
 var _dialog = require("../../dialog");
-var _utils2 = require("./utils");
+var _utils3 = require("./utils");
 var _selectList = _interopRequireDefault(require("../../dialog/select-list"));
 var _arrow = _interopRequireDefault(require("./arrow.svg"));
 var _useProvider = require("../../../hooks/use-provider");
@@ -39,7 +40,7 @@ var _excluded = ["notExistsToolbar", "toolbar"],
   _excluded2 = ["subToolbar", "notExistsColumns", "showFields", "isExit", "toolbar"]; // import './index.less';
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var FormulaList = (0, _react.forwardRef)(function (props, ref) {
-  var _storage$_metabaseCop, _caseList2;
+  var _storage$_metabaseCop, _store$operatorList, _caseList2;
   // 响应 storage._metabaseCopyItems 变化，保证粘贴按钮能实时显示
   var _useState = (0, _react.useState)((_storage["default"] === null || _storage["default"] === void 0 || (_storage$_metabaseCop = _storage["default"]._metabaseCopyItems) === null || _storage$_metabaseCop === void 0 ? void 0 : _storage$_metabaseCop.length) || 0),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
@@ -59,14 +60,15 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
       window.removeEventListener('sqb-checked-items-changed', handler);
     };
   }, []);
+  var store = (0, _useProvider.useStore)();
   var value = props.value,
     data = props.data,
     exitData = props.exitData,
     onChange = props.onChange,
     _props$customTypes = props.customTypes,
-    _customTypes = _props$customTypes === void 0 ? _utils2.customTypes : _props$customTypes,
+    _customTypes = _props$customTypes === void 0 ? _utils3.customTypes : _props$customTypes,
     _props$operatorList = props.operatorList,
-    _operatorList = _props$operatorList === void 0 ? _utils2.operatorList : _props$operatorList,
+    _operatorList = _props$operatorList === void 0 ? ((_store$operatorList = store.operatorList) === null || _store$operatorList === void 0 ? void 0 : _store$operatorList.length) > 0 ? store.operatorList : _utils3.operatorList : _props$operatorList,
     _props$isCustom = props.isCustom,
     isCustom = _props$isCustom === void 0 ? false : _props$isCustom,
     _props$showPreview = props.showPreview,
@@ -75,8 +77,14 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     _props$_type = props._type,
     _type = _props$_type === void 0 ? 'filter' : _props$_type;
   var caseList = value || [];
-  var store = (0, _useProvider.useStore)();
   var caseListRef = (0, _react.useRef)(caseList);
+  var operatorList = (0, _react.useMemo)(function () {
+    if (store.operatorList.length > 0) {
+      return store.operatorList;
+    } else {
+      return _utils3.operatorList;
+    }
+  }, [store.operatorList]);
   var _useState3 = (0, _react.useState)(''),
     _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
     oldCode = _useState4[0],
@@ -94,13 +102,17 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
     isCopy = _useState8[0],
     setIsCopy = _useState8[1];
+  var _useState9 = (0, _react.useState)((0, _utils.getObjTem)(store.formulaTemplates)),
+    _useState0 = (0, _slicedToArray2["default"])(_useState9, 2),
+    formulaList = _useState0[0],
+    setFunctionList = _useState0[1];
   (0, _react.useEffect)(function () {
     setOldCode(getPreviewStr(caseList));
   }, []);
-  var _useState9 = (0, _react.useState)(''),
-    _useState0 = (0, _slicedToArray2["default"])(_useState9, 2),
-    filterVal = _useState0[0],
-    setFilterVal = _useState0[1];
+  var _useState1 = (0, _react.useState)(''),
+    _useState10 = (0, _slicedToArray2["default"])(_useState1, 2),
+    filterVal = _useState10[0],
+    setFilterVal = _useState10[1];
   var setCaseList = function setCaseList(data) {
     var quotes = data.map(function (v, i) {
       if (v !== null && v !== void 0 && v.quotes) {
@@ -115,35 +127,35 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     caseList = data;
     caseListRef.current = data;
   };
-  var _useState1 = (0, _react.useState)(-1),
-    _useState10 = (0, _slicedToArray2["default"])(_useState1, 2),
-    ind = _useState10[0],
-    setInd = _useState10[1];
+  var _useState11 = (0, _react.useState)(-1),
+    _useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
+    ind = _useState12[0],
+    setInd = _useState12[1];
   var filterCustomType = store.filterCustomType;
   var _ref = (0, _react.useRef)(null);
-  var _useState11 = (0, _react.useState)({
+  var _useState13 = (0, _react.useState)({
       isError: false
     }),
-    _useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
-    errorInfo = _useState12[0],
-    setErrorInfo = _useState12[1];
-  var _useState13 = (0, _react.useState)(false),
     _useState14 = (0, _slicedToArray2["default"])(_useState13, 2),
-    isCheck = _useState14[0],
-    setIsCheck = _useState14[1];
-  var myInstanceIdRef = (0, _react.useRef)(Math.random().toString(36).slice(2));
-  var _useState15 = (0, _react.useState)(!!window.__sqb_selection_active__),
+    errorInfo = _useState14[0],
+    setErrorInfo = _useState14[1];
+  var _useState15 = (0, _react.useState)(false),
     _useState16 = (0, _slicedToArray2["default"])(_useState15, 2),
-    globalSelectionActive = _useState16[0],
-    setGlobalSelectionActive = _useState16[1];
-  var _useState17 = (0, _react.useState)(window.__sqb_selection_owner__ || null),
+    isCheck = _useState16[0],
+    setIsCheck = _useState16[1];
+  var myInstanceIdRef = (0, _react.useRef)(Math.random().toString(36).slice(2));
+  var _useState17 = (0, _react.useState)(!!window.__sqb_selection_active__),
     _useState18 = (0, _slicedToArray2["default"])(_useState17, 2),
-    globalSelectionOwner = _useState18[0],
-    setGlobalSelectionOwner = _useState18[1];
-  var _useState19 = (0, _react.useState)([]),
+    globalSelectionActive = _useState18[0],
+    setGlobalSelectionActive = _useState18[1];
+  var _useState19 = (0, _react.useState)(window.__sqb_selection_owner__ || null),
     _useState20 = (0, _slicedToArray2["default"])(_useState19, 2),
-    selectedIndices = _useState20[0],
-    setSelectedIndices = _useState20[1];
+    globalSelectionOwner = _useState20[0],
+    setGlobalSelectionOwner = _useState20[1];
+  var _useState21 = (0, _react.useState)([]),
+    _useState22 = (0, _slicedToArray2["default"])(_useState21, 2),
+    selectedIndices = _useState22[0],
+    setSelectedIndices = _useState22[1];
   (0, _react.useEffect)(function () {
     var leftBrackets = caseList.filter(function (v) {
       return v.type === _types.AtomsTypeEnum.OPERATOR && v.val === '(';
@@ -152,7 +164,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
       return v.type === _types.AtomsTypeEnum.OPERATOR && v.val === ')';
     }).length;
     // setIsSqlError(leftBrackets != rightBrackets);
-    var _errorInfo = (0, _utils2.validateExpressionIntegrity)(caseList);
+    var _errorInfo = (0, _utils3.validateExpressionIntegrity)(caseList);
     setErrorInfo(_errorInfo);
   }, [caseList]);
   // 获取预览字符串
@@ -186,7 +198,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
       position = props.position,
       _props$trigger = props.trigger,
       trigger = _props$trigger === void 0 ? 'click' : _props$trigger;
-    var showOperatorList = _utils2.operatorList.filter(function (v) {
+    var showOperatorList = operatorList.filter(function (v) {
       return ~(v + (v || '')).toLocaleLowerCase().indexOf(filterVal.toLocaleLowerCase());
     });
     return (0, _jsxRuntime.jsxs)(_pandora.Select, {
@@ -268,9 +280,15 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
   // 常量
   var handleConstant = function handleConstant(val, i) {
     var _caseList = caseList.slice();
-    var oldType = _caseList[i].val;
-    _caseList[i].val = val;
-    _caseList = (0, _utils2.insertTemplateAt)(oldType, val, _caseList, i);
+    var oldVal = _caseList[i].val;
+    var oldType = _caseList[i].type;
+    if (oldType === _types.AtomsTypeEnum.CONSTANT) {
+      _caseList[i].id = val;
+      _caseList[i].val = (0, _utils3.getConstantLabel)(store.constantList, val);
+    } else {
+      _caseList[i].val = val;
+    }
+    _caseList = (0, _utils3.insertTemplateAt)(oldVal, val, _caseList, i);
     setCaseList(_caseList);
   };
   // 表达式
@@ -323,7 +341,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     var _caseList = caseList.slice();
     // determine items to paste (selected items have priority)
     var itemsToPaste = _storage["default"]._metabaseCopyItems || [];
-    itemsToPaste = (0, _utils.changeCopyField)(itemsToPaste, data);
+    itemsToPaste = (0, _utils2.changeCopyField)(itemsToPaste, data);
     if (itemsToPaste.length) {
       if (index === -1) {
         _caseList.push.apply(_caseList, (0, _toConsumableArray2["default"])(itemsToPaste));
@@ -426,7 +444,7 @@ 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, _utils2.getTemplateItem)(type);
+    var temItem = (0, _utils3.getTemplateItem)(type);
     if (position === 'add') {
       _caseList.push(temItem);
       _ind = index + 1;
@@ -476,7 +494,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
               }
               var expression = {
                 notExists: (0, _cloneDeep["default"])(newList),
-                quotes: (0, _utils.buildSqlQuery)(newList, caseList[i].type),
+                quotes: (0, _utils2.buildSqlQuery)(newList, caseList[i].type),
                 type: caseList[i].type
               };
               caseList[i] = expression;
@@ -528,7 +546,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
               }
               var expression = {
                 subQuery: (0, _cloneDeep["default"])(newList),
-                quotes: (0, _utils.buildSqlQuery)(newList, caseList[i].type),
+                quotes: (0, _utils2.buildSqlQuery)(newList, caseList[i].type),
                 type: caseList[i].type
               };
               caseList[i] = expression;
@@ -639,7 +657,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     } else if (type === _types.AtomsTypeEnum.FIELD) {
       // 字段
       return (0, _jsxRuntime.jsx)(_itemName["default"], {
-        isError: (0, _utils.isError)(v, data),
+        isError: (0, _utils2.isError)(v, data),
         children: (0, _jsxRuntime.jsxs)("div", {
           className: (0, _classnames["default"])("Sqb-TableName ", {
             notSelected: !(v !== null && v !== void 0 && v.fieldName)
@@ -737,27 +755,38 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
       });
     } else if (type === _types.AtomsTypeEnum.CONSTANT) {
       //常量
-      return (0, _jsxRuntime.jsxs)("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'), (0, _jsxRuntime.jsx)("span", {
-          style: {
-            fontSize: 0
-          },
-          onClick: function onClick(e) {
-            return handleDel(e, index);
-          },
-          children: (0, _jsxRuntime.jsx)(_icons.CloseIcon, {})
-        })]
+      return (0, _jsxRuntime.jsx)(_itemName["default"], {
+        isError: !(0, _utils3.getConstantLabel)(store.constantList, v.id || v.val),
+        message: "\u5E38\u91CF\u5B57\u6BB5\u672A\u80FD\u6B63\u786E\u5BF9\u5E94",
+        children: (0, _jsxRuntime.jsxs)("div", {
+          className: (0, _classnames["default"])("Sqb-TableName", {
+            notSelected: !v.val
+          }),
+          "v-index": index,
+          "v-val": v.id || v.val,
+          onClick: selectConstant,
+          children: [(0, _utils3.getConstantLabel)(store.constantList, v.id || v.val, v.val) || (0, _locale.__)('SqlQueryBuilder.pickConstant'), (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 (v.condition === '早于' && v.rhs.length === 2) {
+        var _caseList$index$quote;
+        var _caseList = caseList.slice();
+        _caseList[index].rhs = [_caseList[index].rhs[0]];
+        _caseList[index].quotes = (_caseList$index$quote = _caseList[index].quotes.split(' || ')) === null || _caseList$index$quote === void 0 ? void 0 : _caseList$index$quote[0];
+        setCaseList(_caseList);
+      }
       // 表达式
       return (0, _jsxRuntime.jsx)(_itemName["default"], {
-        isError: (0, _utils.isError)(v, data),
+        isError: (0, _utils2.isError)(v, data),
         children: (0, _jsxRuntime.jsxs)("div", {
           className: (0, _classnames["default"])("Sqb-TableName purple-name", {
             notSelected: !v.quotes
@@ -779,13 +808,13 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     } else if (type === _types.AtomsTypeEnum.FORMULA) {
       // 公式
       return (0, _jsxRuntime.jsx)(_itemName["default"], {
-        isError: (0, _utils.isError)(v, data),
+        isError: (0, _utils2.isError)(v, data),
         children: (0, _jsxRuntime.jsxs)("div", {
           className: (0, _classnames["default"])("Sqb-TableName gray-name"),
           onClick: function onClick(e) {
             return showFunction(e, index);
           },
-          children: [v.quotes ? v.quotes : (0, _locale.__)('customColumn.selectFormula'), (0, _jsxRuntime.jsx)("span", {
+          children: [v.name ? (0, _utils.getQuotes)(v, v.args, formulaList) : (0, _locale.__)('customColumn.selectFormula'), (0, _jsxRuntime.jsx)("span", {
             style: {
               fontSize: 0
             },

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

@@ -26,3 +26,4 @@ export declare function validateExpressionIntegrity(list: AtomsItem[]): {
     isCase?: boolean;
     isOver?: boolean;
 };
+export declare const getConstantLabel: (list: any[], val: string, defaultVal?: string) => any;

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.operatorList = exports.isOk = exports.insertTemplateAt = exports.getTemplateItem = exports.customTypes = void 0;
+exports.operatorList = exports.isOk = exports.insertTemplateAt = exports.getTemplateItem = exports.getConstantLabel = exports.customTypes = void 0;
 exports.validateExpressionIntegrity = validateExpressionIntegrity;
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createForOfIteratorHelper"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
@@ -466,4 +466,11 @@ function validateExpressionIntegrity(list) {
   return {
     isError: false
   };
-}
+}
+var getConstantLabel = exports.getConstantLabel = function getConstantLabel(list, val, defaultVal) {
+  var _list$filter;
+  var _list = (0, _toConsumableArray2["default"])(list);
+  return ((_list$filter = _list.filter(function (v) {
+    return v.value === val;
+  })) === null || _list$filter === void 0 || (_list$filter = _list$filter[0]) === null || _list$filter === void 0 ? void 0 : _list$filter.label) || defaultVal || '';
+};

package/lib/cjs/components/modules/components/item-name.d.ts

@@ -2,6 +2,7 @@ import React from 'react';
 interface HeaderProps {
     children: React.ReactNode;
     isError: boolean;
+    message?: string;
 }
 declare const ItemName: (props: HeaderProps) => import("react/jsx-runtime").JSX.Element;
 export default ItemName;

package/lib/cjs/components/modules/components/item-name.js

@@ -10,11 +10,12 @@ var _pandoraIcons = require("@gingkoo/pandora-icons");
 var _locale = require("../../../locale");
 var ItemName = function ItemName(props) {
   var children = props.children,
-    isError = props.isError;
+    isError = props.isError,
+    message = props.message;
   return (0, _jsxRuntime.jsx)(_pandora.Badge, {
     offset: [-8, 0],
     count: isError ? (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
-      title: (0, _locale.__)('metabase.verify'),
+      title: message || (0, _locale.__)('metabase.verify'),
       children: (0, _jsxRuntime.jsx)(_pandora.Button, {
         className: 'isError',
         style: {

package/lib/cjs/hooks/use-state.js

@@ -165,32 +165,36 @@ var useStore = function useStore() {
     setSourceTable = _useState52[1];
   var _useState53 = (0, _react.useState)([]),
     _useState54 = (0, _slicedToArray2["default"])(_useState53, 2),
-    copyType = _useState54[0],
-    setCopyType = _useState54[1]; // 复制类型
-  var _useState55 = (0, _react.useState)(false),
+    operatorList = _useState54[0],
+    setOperatorList = _useState54[1]; // 操作符
+  var _useState55 = (0, _react.useState)([]),
     _useState56 = (0, _slicedToArray2["default"])(_useState55, 2),
-    metabaseCopy = _useState56[0],
-    setMetabaseCopy = _useState56[1]; // 是否开启复制功能
+    copyType = _useState56[0],
+    setCopyType = _useState56[1]; // 复制类型
   var _useState57 = (0, _react.useState)(false),
     _useState58 = (0, _slicedToArray2["default"])(_useState57, 2),
-    moduleDiff = _useState58[0],
-    setModuleDiff = _useState58[1]; // 是否开启模块比对功能
-  var _useState59 = (0, _react.useState)([]),
+    metabaseCopy = _useState58[0],
+    setMetabaseCopy = _useState58[1]; // 是否开启复制功能
+  var _useState59 = (0, _react.useState)(false),
     _useState60 = (0, _slicedToArray2["default"])(_useState59, 2),
-    sourceData = _useState60[0],
-    setSourceData = _useState60[1]; // 原始数据
-  var _useState61 = (0, _react.useState)(false),
+    moduleDiff = _useState60[0],
+    setModuleDiff = _useState60[1]; // 是否开启模块比对功能
+  var _useState61 = (0, _react.useState)([]),
     _useState62 = (0, _slicedToArray2["default"])(_useState61, 2),
-    moduleCopy = _useState62[0],
-    setModuleCopy = _useState62[1]; // 是否开启模块复制功能
+    sourceData = _useState62[0],
+    setSourceData = _useState62[1]; // 原始数据
   var _useState63 = (0, _react.useState)(false),
     _useState64 = (0, _slicedToArray2["default"])(_useState63, 2),
-    isMetabaseCopy = _useState64[0],
-    setIsMetabaseCopy = _useState64[1]; // 是否开启勾选组复制
-  var _useState65 = (0, _react.useState)(_storage["default"]._metabaseCopyModule || []),
+    moduleCopy = _useState64[0],
+    setModuleCopy = _useState64[1]; // 是否开启模块复制功能
+  var _useState65 = (0, _react.useState)(false),
     _useState66 = (0, _slicedToArray2["default"])(_useState65, 2),
-    metabaseCopyModule = _useState66[0],
-    setMetabaseCopyModule = _useState66[1]; // 复制的内容
+    isMetabaseCopy = _useState66[0],
+    setIsMetabaseCopy = _useState66[1]; // 是否开启勾选组复制
+  var _useState67 = (0, _react.useState)(_storage["default"]._metabaseCopyModule || []),
+    _useState68 = (0, _slicedToArray2["default"])(_useState67, 2),
+    metabaseCopyModule = _useState68[0],
+    setMetabaseCopyModule = _useState68[1]; // 复制的内容
   var setFormulaTemplates = function setFormulaTemplates(data) {
     var newData = data === null || data === void 0 ? void 0 : data.map(function (v) {
       var children = v.children.map(function (vv) {
@@ -872,7 +876,9 @@ var useStore = function useStore() {
     metabaseCopyModule: metabaseCopyModule,
     setMetabaseCopyModule: setMetabaseCopyModule,
     isMetabaseCopy: isMetabaseCopy,
-    setIsMetabaseCopy: setIsMetabaseCopy
+    setIsMetabaseCopy: setIsMetabaseCopy,
+    operatorList: operatorList,
+    setOperatorList: setOperatorList
   };
 };
 var _default = exports["default"] = useStore;

package/lib/cjs/index.js

@@ -78,7 +78,9 @@ var SqlVisionBuilder = _react["default"].forwardRef(function (props, ref) {
     _props$moduleDiff = props.moduleDiff,
     moduleDiff = _props$moduleDiff === void 0 ? false : _props$moduleDiff,
     _props$moduleCopy = props.moduleCopy,
-    moduleCopy = _props$moduleCopy === void 0 ? false : _props$moduleCopy;
+    moduleCopy = _props$moduleCopy === void 0 ? false : _props$moduleCopy,
+    _props$operatorList = props.operatorList,
+    operatorList = _props$operatorList === void 0 ? [] : _props$operatorList;
   var store = (0, _useState["default"])();
   (0, _react.useEffect)(function () {
     getTables && store.setFetchDatasetFn(getTables);
@@ -120,7 +122,8 @@ var SqlVisionBuilder = _react["default"].forwardRef(function (props, ref) {
     store.setModuleDiff(moduleDiff);
     store.setIsSubquery(isSubquery);
     store.setModuleCopy(moduleCopy);
-  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType, isExit, tableEnableAlias, fieldEnableAlias, groupByEnableAlias, isSelectFields, tableFlat, copyType, metabaseCopy, moduleDiff, isSubquery, moduleCopy]);
+    store.setOperatorList(operatorList);
+  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType, isExit, tableEnableAlias, fieldEnableAlias, groupByEnableAlias, isSelectFields, tableFlat, copyType, metabaseCopy, moduleDiff, isSubquery, moduleCopy, operatorList]);
   _react["default"].useImperativeHandle(ref, function () {
     return {
       // setDatasource: (list) => {

package/lib/cjs/store/types.d.ts

@@ -121,6 +121,7 @@ export interface AtomsInputNumber {
     type: AtomsTypeEnum.INPUT_NUMBER;
 }
 export interface AtomsConstant {
+    id?: string;
     val: string;
     type: AtomsTypeEnum.CONSTANT;
 }

package/lib/cjs/types.d.ts

@@ -59,6 +59,7 @@ export interface MetabaseProps {
         oldCode: string;
         newCode: string;
     }>;
+    operatorList?: any[];
 }
 export interface OptionItem {
     value?: string;

package/lib/cjs/utils.js

@@ -734,7 +734,8 @@ var _isError = exports.isError = function isError(item, data) {
       tableId = _item$tableId === void 0 ? '' : _item$tableId,
       _item$tableAlias = item.tableAlias,
       tableAlias = _item$tableAlias === void 0 ? '' : _item$tableAlias,
-      fieldName = item.fieldName;
+      fieldName = item.fieldName,
+      fieldId = item.fieldId;
     var _datasourceId = datasourceId || 'source'; // 默认为source
     if (tableId === 'source') {
       _datasourceId = 'source';
@@ -750,13 +751,13 @@ var _isError = exports.isError = function isError(item, data) {
       } else {
         var _tables$_datasourceId2;
         return tables === null || tables === void 0 || (_tables$_datasourceId2 = tables[_datasourceId]) === null || _tables$_datasourceId2 === void 0 || (_tables$_datasourceId2 = _tables$_datasourceId2[tableId]) === null || _tables$_datasourceId2 === void 0 ? void 0 : _tables$_datasourceId2.every(function (field) {
-          return field.name !== fieldName;
+          return field.name !== fieldName || field.id !== fieldId;
         });
       }
     } else {
       var _tables$_datasourceId3;
       var hasField = (tables === null || tables === void 0 || (_tables$_datasourceId3 = tables[_datasourceId]) === null || _tables$_datasourceId3 === void 0 || (_tables$_datasourceId3 = _tables$_datasourceId3[tableId + tableAlias]) === null || _tables$_datasourceId3 === void 0 || (_tables$_datasourceId3 = _tables$_datasourceId3.filter(function (v) {
-        return v.name === fieldName;
+        return v.name === fieldName && v.id === fieldId;
       })) === null || _tables$_datasourceId3 === void 0 ? void 0 : _tables$_datasourceId3.length) > 0;
       return !hasField; // 注意：返回 true 表示“有错误”
     }

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

@@ -10,7 +10,7 @@ import FormulaList from '../formula-list';
 import { AddIcon, CloseIcon } from '../../icons';
 import { isOk } from '../formula-list/utils';
 import { __ } from '../../../locale';
-import { getTemArgs, getObjTem, getParamActions } from './utils';
+import { getTemArgs, getObjTem, getParamActions, getQuotes } from './utils';
 import Styled from 'styled-components';
 // import { OptionsTypeEnum, customTypes, otherList, operatorList, functionList } from './enum';
 import { AtomsTypeEnum, FormulaTypeEnum } from '../../../store/types';
@@ -72,7 +72,7 @@ var CaseEditor = React.forwardRef(function (props, ref) {
   // 确定
   var _onOk = function _onOk() {
     typeof onOk === 'function' && (onOk === null || onOk === void 0 ? void 0 : onOk(_objectSpread(_objectSpread({}, fun), {}, {
-      quotes: getQuotes(fun.args)
+      quotes: getQuotes(fun, fun.args, formulaList)
     })));
   };
   // 选择公式名
@@ -87,21 +87,6 @@ var CaseEditor = React.forwardRef(function (props, ref) {
       name: formulaList === null || formulaList === void 0 || (_formulaList$id3 = formulaList[id]) === null || _formulaList$id3 === void 0 ? void 0 : _formulaList$id3.name
     }));
   };
-  var getQuotes = function getQuotes(_args) {
-    var quotes = _args.map(function (v) {
-      var quotes = v.list.map(function (vv, i) {
-        if (vv !== null && vv !== void 0 && vv.quotes) {
-          return vv === null || vv === void 0 ? void 0 : vv.quotes;
-        } else if (vv !== null && vv !== void 0 && vv.fieldName) {
-          return vv === null || vv === void 0 ? void 0 : vv.fieldName;
-        } else {
-          return vv.val;
-        }
-      }).join(' ');
-      return quotes;
-    }).join(' , ');
-    return fun.name + ' ( ' + quotes + ' ) ';
-  };
   var addParams = function addParams(index) {
     var _args = cloneDeep(fun.args);
     var tem = getTemArgs(formulaList === null || formulaList === void 0 ? void 0 : formulaList[fun.name].args)[index + 1] || {
@@ -110,7 +95,7 @@ var CaseEditor = React.forwardRef(function (props, ref) {
     };
     _args.splice(index + 1, 0, tem);
     setFun(_objectSpread(_objectSpread({}, fun), {}, {
-      quotes: getQuotes(_args),
+      quotes: getQuotes(fun, _args, formulaList),
       args: _args
     }));
   };
@@ -118,7 +103,7 @@ var CaseEditor = React.forwardRef(function (props, ref) {
     var _args = cloneDeep(fun.args);
     _args.splice(index, 1);
     setFun(_objectSpread(_objectSpread({}, fun), {}, {
-      quotes: getQuotes(_args),
+      quotes: getQuotes(fun, _args, formulaList),
       args: _args
     }));
   };
@@ -147,11 +132,12 @@ var CaseEditor = React.forwardRef(function (props, ref) {
                 },
                 value: fun.id || fun.name,
                 triggerElement: function triggerElement(value) {
+                  var _formulaList$fun$id;
                   return _jsx("div", {
                     className: cx("Sqb-TableName Sqb-TableName-OPERATOR", {
                       notSelected: !fun.name
                     }),
-                    children: fun.name ? fun.name : __('customColumn.selectFormula')
+                    children: fun.id ? (_formulaList$fun$id = formulaList[fun.id]) === null || _formulaList$fun$id === void 0 ? void 0 : _formulaList$fun$id.name : __('customColumn.selectFormula')
                   });
                 },
                 onChange: function onChange(val) {
@@ -214,7 +200,7 @@ var CaseEditor = React.forwardRef(function (props, ref) {
                       //   })
                       //   .join(' , ');
                       setFun(_objectSpread(_objectSpread({}, fun), {}, {
-                        quotes: getQuotes(_args),
+                        quotes: getQuotes(fun, _args, formulaList),
                         //fun.name + ' ( ' + quotes + ' ) ',
                         args: _args
                       }));

package/lib/es/components/dialog/formula/utils.d.ts

@@ -5,3 +5,4 @@ export declare function getParamActions(params: AtomsItem[], arity?: Arity): {
     canAdd: boolean;
     canDel: boolean;
 };
+export declare const getQuotes: (fun: any, _args: AtomsItem[], formulaList: any) => string;

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

@@ -55,4 +55,20 @@ export function getParamActions(params, arity) {
     // 小于 max 才能加
     canDel: len > effectiveMin // 大于 min 才能删
   };
-}
+}
+export var getQuotes = function getQuotes(fun, _args, formulaList) {
+  var _formulaList$fun$id;
+  var quotes = _args === null || _args === void 0 ? void 0 : _args.map(function (v) {
+    var quotes = v.list.map(function (vv, i) {
+      if (vv !== null && vv !== void 0 && vv.quotes) {
+        return vv === null || vv === void 0 ? void 0 : vv.quotes;
+      } else if (vv !== null && vv !== void 0 && vv.fieldName) {
+        return vv === null || vv === void 0 ? void 0 : vv.fieldName;
+      } else {
+        return vv.val;
+      }
+    }).join(' ');
+    return quotes;
+  }).join(' , ');
+  return ((_formulaList$fun$id = formulaList[fun.id]) === null || _formulaList$fun$id === void 0 ? void 0 : _formulaList$fun$id.name) + ' ( ' + quotes + ' ) ';
+};

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

@@ -7,7 +7,7 @@ var _excluded = ["notExistsToolbar", "toolbar"],
   _excluded2 = ["subToolbar", "notExistsColumns", "showFields", "isExit", "toolbar"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import React, { useEffect, useState, useRef, forwardRef } from 'react';
+import React, { useEffect, useState, useMemo, useRef, forwardRef } from 'react';
 import './index.less';
 import { FieldString, FieldNumber, FfPlus } from '@gingkoo/pandora-icons';
 import cx from 'classnames';
@@ -15,6 +15,7 @@ import cx from 'classnames';
 import Metabase from '../../../index';
 import { __ } from '../../../locale';
 import isEqual from 'lodash/isEqual';
+import { getObjTem, getQuotes } from '../formula/utils';
 import { AtomsTypeEnum, FormulaTypeEnum } from '../../../store/types';
 import { ColumnsPopupThemeEnum } from '../../../store/enum';
 import { Select, Input, Modal2, Modal, InputNumber, Radio, Space, Button, Checkbox, Tooltip } from '@gingkoo/pandora';
@@ -23,7 +24,7 @@ import { buildSqlQuery, isError, changeCopyField } from '../../../utils';
 import Formula from '../formula';
 import { AddIcon, CloseIcon } from '../../icons';
 import { Expression, SelectColumnMultiple } from '../../dialog';
-import { customTypes, operatorList, insertTemplateAt, getTemplateItem, validateExpressionIntegrity } from './utils';
+import { customTypes, operatorList as __operatorList, insertTemplateAt, getTemplateItem, validateExpressionIntegrity, getConstantLabel } from './utils';
 import SelectList from '../../dialog/select-list';
 import arrow from './arrow.svg';
 import { useStore, Provider } from '../../../hooks/use-provider';
@@ -31,7 +32,7 @@ import ItemName from '../../modules/components/item-name';
 import DiffViewer from '../diff-viewer';
 import storage from '../../../utils/storage';
 var FormulaList = forwardRef(function (props, ref) {
-  var _storage$_metabaseCop, _caseList2;
+  var _storage$_metabaseCop, _store$operatorList, _caseList2;
   // 响应 storage._metabaseCopyItems 变化，保证粘贴按钮能实时显示
   var _useState = useState((storage === null || storage === void 0 || (_storage$_metabaseCop = storage._metabaseCopyItems) === null || _storage$_metabaseCop === void 0 ? void 0 : _storage$_metabaseCop.length) || 0),
     _useState2 = _slicedToArray(_useState, 2),
@@ -51,6 +52,7 @@ var FormulaList = forwardRef(function (props, ref) {
       window.removeEventListener('sqb-checked-items-changed', handler);
     };
   }, []);
+  var store = useStore();
   var value = props.value,
     data = props.data,
     exitData = props.exitData,
@@ -58,7 +60,7 @@ var FormulaList = forwardRef(function (props, ref) {
     _props$customTypes = props.customTypes,
     _customTypes = _props$customTypes === void 0 ? customTypes : _props$customTypes,
     _props$operatorList = props.operatorList,
-    _operatorList = _props$operatorList === void 0 ? operatorList : _props$operatorList,
+    _operatorList = _props$operatorList === void 0 ? ((_store$operatorList = store.operatorList) === null || _store$operatorList === void 0 ? void 0 : _store$operatorList.length) > 0 ? store.operatorList : __operatorList : _props$operatorList,
     _props$isCustom = props.isCustom,
     isCustom = _props$isCustom === void 0 ? false : _props$isCustom,
     _props$showPreview = props.showPreview,
@@ -67,8 +69,14 @@ var FormulaList = forwardRef(function (props, ref) {
     _props$_type = props._type,
     _type = _props$_type === void 0 ? 'filter' : _props$_type;
   var caseList = value || [];
-  var store = useStore();
   var caseListRef = useRef(caseList);
+  var operatorList = useMemo(function () {
+    if (store.operatorList.length > 0) {
+      return store.operatorList;
+    } else {
+      return __operatorList;
+    }
+  }, [store.operatorList]);
   var _useState3 = useState(''),
     _useState4 = _slicedToArray(_useState3, 2),
     oldCode = _useState4[0],
@@ -86,13 +94,17 @@ var FormulaList = forwardRef(function (props, ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     isCopy = _useState8[0],
     setIsCopy = _useState8[1];
+  var _useState9 = useState(getObjTem(store.formulaTemplates)),
+    _useState0 = _slicedToArray(_useState9, 2),
+    formulaList = _useState0[0],
+    setFunctionList = _useState0[1];
   useEffect(function () {
     setOldCode(getPreviewStr(caseList));
   }, []);
-  var _useState9 = useState(''),
-    _useState0 = _slicedToArray(_useState9, 2),
-    filterVal = _useState0[0],
-    setFilterVal = _useState0[1];
+  var _useState1 = useState(''),
+    _useState10 = _slicedToArray(_useState1, 2),
+    filterVal = _useState10[0],
+    setFilterVal = _useState10[1];
   var setCaseList = function setCaseList(data) {
     var quotes = data.map(function (v, i) {
       if (v !== null && v !== void 0 && v.quotes) {
@@ -107,35 +119,35 @@ var FormulaList = forwardRef(function (props, ref) {
     caseList = data;
     caseListRef.current = data;
   };
-  var _useState1 = useState(-1),
-    _useState10 = _slicedToArray(_useState1, 2),
-    ind = _useState10[0],
-    setInd = _useState10[1];
+  var _useState11 = useState(-1),
+    _useState12 = _slicedToArray(_useState11, 2),
+    ind = _useState12[0],
+    setInd = _useState12[1];
   var filterCustomType = store.filterCustomType;
   var _ref = useRef(null);
-  var _useState11 = useState({
+  var _useState13 = useState({
       isError: false
     }),
-    _useState12 = _slicedToArray(_useState11, 2),
-    errorInfo = _useState12[0],
-    setErrorInfo = _useState12[1];
-  var _useState13 = useState(false),
     _useState14 = _slicedToArray(_useState13, 2),
-    isCheck = _useState14[0],
-    setIsCheck = _useState14[1];
-  var myInstanceIdRef = useRef(Math.random().toString(36).slice(2));
-  var _useState15 = useState(!!window.__sqb_selection_active__),
+    errorInfo = _useState14[0],
+    setErrorInfo = _useState14[1];
+  var _useState15 = useState(false),
     _useState16 = _slicedToArray(_useState15, 2),
-    globalSelectionActive = _useState16[0],
-    setGlobalSelectionActive = _useState16[1];
-  var _useState17 = useState(window.__sqb_selection_owner__ || null),
+    isCheck = _useState16[0],
+    setIsCheck = _useState16[1];
+  var myInstanceIdRef = useRef(Math.random().toString(36).slice(2));
+  var _useState17 = useState(!!window.__sqb_selection_active__),
     _useState18 = _slicedToArray(_useState17, 2),
-    globalSelectionOwner = _useState18[0],
-    setGlobalSelectionOwner = _useState18[1];
-  var _useState19 = useState([]),
+    globalSelectionActive = _useState18[0],
+    setGlobalSelectionActive = _useState18[1];
+  var _useState19 = useState(window.__sqb_selection_owner__ || null),
     _useState20 = _slicedToArray(_useState19, 2),
-    selectedIndices = _useState20[0],
-    setSelectedIndices = _useState20[1];
+    globalSelectionOwner = _useState20[0],
+    setGlobalSelectionOwner = _useState20[1];
+  var _useState21 = useState([]),
+    _useState22 = _slicedToArray(_useState21, 2),
+    selectedIndices = _useState22[0],
+    setSelectedIndices = _useState22[1];
   useEffect(function () {
     var leftBrackets = caseList.filter(function (v) {
       return v.type === AtomsTypeEnum.OPERATOR && v.val === '(';
@@ -260,9 +272,15 @@ var FormulaList = forwardRef(function (props, ref) {
   // 常量
   var handleConstant = function handleConstant(val, i) {
     var _caseList = caseList.slice();
-    var oldType = _caseList[i].val;
-    _caseList[i].val = val;
-    _caseList = insertTemplateAt(oldType, val, _caseList, i);
+    var oldVal = _caseList[i].val;
+    var oldType = _caseList[i].type;
+    if (oldType === AtomsTypeEnum.CONSTANT) {
+      _caseList[i].id = val;
+      _caseList[i].val = getConstantLabel(store.constantList, val);
+    } else {
+      _caseList[i].val = val;
+    }
+    _caseList = insertTemplateAt(oldVal, val, _caseList, i);
     setCaseList(_caseList);
   };
   // 表达式
@@ -729,24 +747,35 @@ var FormulaList = forwardRef(function (props, ref) {
       });
     } else if (type === AtomsTypeEnum.CONSTANT) {
       //常量
-      return _jsxs("div", {
-        className: cx("Sqb-TableName", {
-          notSelected: !v.val
-        }),
-        "v-index": index,
-        "v-val": v.val,
-        onClick: selectConstant,
-        children: [v.val ? v.val : __('SqlQueryBuilder.pickConstant'), _jsx("span", {
-          style: {
-            fontSize: 0
-          },
-          onClick: function onClick(e) {
-            return handleDel(e, index);
-          },
-          children: _jsx(CloseIcon, {})
-        })]
+      return _jsx(ItemName, {
+        isError: !getConstantLabel(store.constantList, v.id || v.val),
+        message: "\u5E38\u91CF\u5B57\u6BB5\u672A\u80FD\u6B63\u786E\u5BF9\u5E94",
+        children: _jsxs("div", {
+          className: cx("Sqb-TableName", {
+            notSelected: !v.val
+          }),
+          "v-index": index,
+          "v-val": v.id || v.val,
+          onClick: selectConstant,
+          children: [getConstantLabel(store.constantList, v.id || v.val, v.val) || __('SqlQueryBuilder.pickConstant'), _jsx("span", {
+            style: {
+              fontSize: 0
+            },
+            onClick: function onClick(e) {
+              return handleDel(e, index);
+            },
+            children: _jsx(CloseIcon, {})
+          })]
+        })
       }, index);
     } else if (type === AtomsTypeEnum.EXPRESSION) {
+      if (v.condition === '早于' && v.rhs.length === 2) {
+        var _caseList$index$quote;
+        var _caseList = caseList.slice();
+        _caseList[index].rhs = [_caseList[index].rhs[0]];
+        _caseList[index].quotes = (_caseList$index$quote = _caseList[index].quotes.split(' || ')) === null || _caseList$index$quote === void 0 ? void 0 : _caseList$index$quote[0];
+        setCaseList(_caseList);
+      }
       // 表达式
       return _jsx(ItemName, {
         isError: isError(v, data),
@@ -777,7 +806,7 @@ var FormulaList = forwardRef(function (props, ref) {
           onClick: function onClick(e) {
             return showFunction(e, index);
           },
-          children: [v.quotes ? v.quotes : __('customColumn.selectFormula'), _jsx("span", {
+          children: [v.name ? getQuotes(v, v.args, formulaList) : __('customColumn.selectFormula'), _jsx("span", {
             style: {
               fontSize: 0
             },

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

@@ -26,3 +26,4 @@ export declare function validateExpressionIntegrity(list: AtomsItem[]): {
     isCase?: boolean;
     isOver?: boolean;
 };
+export declare const getConstantLabel: (list: any[], val: string, defaultVal?: string) => any;

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

@@ -459,4 +459,11 @@ export function validateExpressionIntegrity(list) {
   return {
     isError: false
   };
-}
+}
+export var getConstantLabel = function getConstantLabel(list, val, defaultVal) {
+  var _list$filter;
+  var _list = _toConsumableArray(list);
+  return ((_list$filter = _list.filter(function (v) {
+    return v.value === val;
+  })) === null || _list$filter === void 0 || (_list$filter = _list$filter[0]) === null || _list$filter === void 0 ? void 0 : _list$filter.label) || defaultVal || '';
+};

package/lib/es/components/modules/components/item-name.d.ts

@@ -2,6 +2,7 @@ import React from 'react';
 interface HeaderProps {
     children: React.ReactNode;
     isError: boolean;
+    message?: string;
 }
 declare const ItemName: (props: HeaderProps) => import("react/jsx-runtime").JSX.Element;
 export default ItemName;

package/lib/es/components/modules/components/item-name.js

@@ -4,11 +4,12 @@ import { ExclamationCircleFill } from '@gingkoo/pandora-icons';
 import { __ } from '../../../locale';
 var ItemName = function ItemName(props) {
   var children = props.children,
-    isError = props.isError;
+    isError = props.isError,
+    message = props.message;
   return _jsx(Badge, {
     offset: [-8, 0],
     count: isError ? _jsx(Tooltip, {
-      title: __('metabase.verify'),
+      title: message || __('metabase.verify'),
       children: _jsx(Button, {
         className: 'isError',
         style: {

package/lib/es/hooks/use-state.js

@@ -159,32 +159,36 @@ var useStore = function useStore() {
     setSourceTable = _useState52[1];
   var _useState53 = useState([]),
     _useState54 = _slicedToArray(_useState53, 2),
-    copyType = _useState54[0],
-    setCopyType = _useState54[1]; // 复制类型
-  var _useState55 = useState(false),
+    operatorList = _useState54[0],
+    setOperatorList = _useState54[1]; // 操作符
+  var _useState55 = useState([]),
     _useState56 = _slicedToArray(_useState55, 2),
-    metabaseCopy = _useState56[0],
-    setMetabaseCopy = _useState56[1]; // 是否开启复制功能
+    copyType = _useState56[0],
+    setCopyType = _useState56[1]; // 复制类型
   var _useState57 = useState(false),
     _useState58 = _slicedToArray(_useState57, 2),
-    moduleDiff = _useState58[0],
-    setModuleDiff = _useState58[1]; // 是否开启模块比对功能
-  var _useState59 = useState([]),
+    metabaseCopy = _useState58[0],
+    setMetabaseCopy = _useState58[1]; // 是否开启复制功能
+  var _useState59 = useState(false),
     _useState60 = _slicedToArray(_useState59, 2),
-    sourceData = _useState60[0],
-    setSourceData = _useState60[1]; // 原始数据
-  var _useState61 = useState(false),
+    moduleDiff = _useState60[0],
+    setModuleDiff = _useState60[1]; // 是否开启模块比对功能
+  var _useState61 = useState([]),
     _useState62 = _slicedToArray(_useState61, 2),
-    moduleCopy = _useState62[0],
-    setModuleCopy = _useState62[1]; // 是否开启模块复制功能
+    sourceData = _useState62[0],
+    setSourceData = _useState62[1]; // 原始数据
   var _useState63 = useState(false),
     _useState64 = _slicedToArray(_useState63, 2),
-    isMetabaseCopy = _useState64[0],
-    setIsMetabaseCopy = _useState64[1]; // 是否开启勾选组复制
-  var _useState65 = useState(storage._metabaseCopyModule || []),
+    moduleCopy = _useState64[0],
+    setModuleCopy = _useState64[1]; // 是否开启模块复制功能
+  var _useState65 = useState(false),
     _useState66 = _slicedToArray(_useState65, 2),
-    metabaseCopyModule = _useState66[0],
-    setMetabaseCopyModule = _useState66[1]; // 复制的内容
+    isMetabaseCopy = _useState66[0],
+    setIsMetabaseCopy = _useState66[1]; // 是否开启勾选组复制
+  var _useState67 = useState(storage._metabaseCopyModule || []),
+    _useState68 = _slicedToArray(_useState67, 2),
+    metabaseCopyModule = _useState68[0],
+    setMetabaseCopyModule = _useState68[1]; // 复制的内容
   var setFormulaTemplates = function setFormulaTemplates(data) {
     var newData = data === null || data === void 0 ? void 0 : data.map(function (v) {
       var children = v.children.map(function (vv) {
@@ -866,7 +870,9 @@ var useStore = function useStore() {
     metabaseCopyModule: metabaseCopyModule,
     setMetabaseCopyModule: setMetabaseCopyModule,
     isMetabaseCopy: isMetabaseCopy,
-    setIsMetabaseCopy: setIsMetabaseCopy
+    setIsMetabaseCopy: setIsMetabaseCopy,
+    operatorList: operatorList,
+    setOperatorList: setOperatorList
   };
 };
 export default useStore;

package/lib/es/index.js

@@ -68,7 +68,9 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     _props$moduleDiff = props.moduleDiff,
     moduleDiff = _props$moduleDiff === void 0 ? false : _props$moduleDiff,
     _props$moduleCopy = props.moduleCopy,
-    moduleCopy = _props$moduleCopy === void 0 ? false : _props$moduleCopy;
+    moduleCopy = _props$moduleCopy === void 0 ? false : _props$moduleCopy,
+    _props$operatorList = props.operatorList,
+    operatorList = _props$operatorList === void 0 ? [] : _props$operatorList;
   var store = useData();
   useEffect(function () {
     getTables && store.setFetchDatasetFn(getTables);
@@ -110,7 +112,8 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     store.setModuleDiff(moduleDiff);
     store.setIsSubquery(isSubquery);
     store.setModuleCopy(moduleCopy);
-  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType, isExit, tableEnableAlias, fieldEnableAlias, groupByEnableAlias, isSelectFields, tableFlat, copyType, metabaseCopy, moduleDiff, isSubquery, moduleCopy]);
+    store.setOperatorList(operatorList);
+  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType, isExit, tableEnableAlias, fieldEnableAlias, groupByEnableAlias, isSelectFields, tableFlat, copyType, metabaseCopy, moduleDiff, isSubquery, moduleCopy, operatorList]);
   React.useImperativeHandle(ref, function () {
     return {
       // setDatasource: (list) => {

package/lib/es/store/types.d.ts

@@ -121,6 +121,7 @@ export interface AtomsInputNumber {
     type: AtomsTypeEnum.INPUT_NUMBER;
 }
 export interface AtomsConstant {
+    id?: string;
     val: string;
     type: AtomsTypeEnum.CONSTANT;
 }

package/lib/es/types.d.ts

@@ -59,6 +59,7 @@ export interface MetabaseProps {
         oldCode: string;
         newCode: string;
     }>;
+    operatorList?: any[];
 }
 export interface OptionItem {
     value?: string;

package/lib/es/utils.js

@@ -723,7 +723,8 @@ var _isError = function isError(item, data) {
       tableId = _item$tableId === void 0 ? '' : _item$tableId,
       _item$tableAlias = item.tableAlias,
       tableAlias = _item$tableAlias === void 0 ? '' : _item$tableAlias,
-      fieldName = item.fieldName;
+      fieldName = item.fieldName,
+      fieldId = item.fieldId;
     var _datasourceId = datasourceId || 'source'; // 默认为source
     if (tableId === 'source') {
       _datasourceId = 'source';
@@ -739,13 +740,13 @@ var _isError = function isError(item, data) {
       } else {
         var _tables$_datasourceId2;
         return tables === null || tables === void 0 || (_tables$_datasourceId2 = tables[_datasourceId]) === null || _tables$_datasourceId2 === void 0 || (_tables$_datasourceId2 = _tables$_datasourceId2[tableId]) === null || _tables$_datasourceId2 === void 0 ? void 0 : _tables$_datasourceId2.every(function (field) {
-          return field.name !== fieldName;
+          return field.name !== fieldName || field.id !== fieldId;
         });
       }
     } else {
       var _tables$_datasourceId3;
       var hasField = (tables === null || tables === void 0 || (_tables$_datasourceId3 = tables[_datasourceId]) === null || _tables$_datasourceId3 === void 0 || (_tables$_datasourceId3 = _tables$_datasourceId3[tableId + tableAlias]) === null || _tables$_datasourceId3 === void 0 || (_tables$_datasourceId3 = _tables$_datasourceId3.filter(function (v) {
-        return v.name === fieldName;
+        return v.name === fieldName && v.id === fieldId;
       })) === null || _tables$_datasourceId3 === void 0 ? void 0 : _tables$_datasourceId3.length) > 0;
       return !hasField; // 注意：返回 true 表示“有错误”
     }

package/package.json

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