@gingkoo/pandora-metabase 1.0.92 → 1.0.93

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

@@ -40,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),
@@ -68,7 +68,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     _props$customTypes = props.customTypes,
     _customTypes = _props$customTypes === void 0 ? _utils3.customTypes : _props$customTypes,
     _props$operatorList = props.operatorList,
-    _operatorList = _props$operatorList === void 0 ? store.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,
@@ -755,24 +755,35 @@ 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.id || v.val,
-        onClick: selectConstant,
-        children: [v.val || v.id ? (0, _utils3.getConstantLabel)(store.constantList, v.id || 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, _utils2.isError)(v, data),

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

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

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

@@ -467,10 +467,10 @@ function validateExpressionIntegrity(list) {
     isError: false
   };
 }
-var getConstantLabel = exports.getConstantLabel = function getConstantLabel(list, val) {
+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) || '';
+  })) === 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/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-list/index.js

@@ -32,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),
@@ -60,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 ? store.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,
@@ -747,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.id || v.val,
-        onClick: selectConstant,
-        children: [v.val || v.id ? getConstantLabel(store.constantList, v.id || 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),

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

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

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

@@ -460,10 +460,10 @@ export function validateExpressionIntegrity(list) {
     isError: false
   };
 }
-export var getConstantLabel = function getConstantLabel(list, val) {
+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) || '';
+  })) === 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/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.92",
+  "version": "1.0.93",
   "description": "",
   "main": "lib/es/index.js",
   "module": "lib/es/index.js",