@gingkoo/pandora-metabase 1.0.22 → 1.0.24

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

@@ -4,51 +4,53 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["notExistsToolbar", "toolbar"];
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import { useEffect, useState, forwardRef } from 'react';
+import { useState, forwardRef } from 'react';
 import cx from 'classnames';
 // import './index.less';
 import Metabase from '../../../index';
 import { __ } from '../../../locale';
 import isEqual from 'lodash/isEqual';
-import { getTemplate } from './utils';
-import { customTypes, operatorList } from './enum';
 import { AtomsTypeEnum } from '../../../store/types';
 import { ColumnsPopupThemeEnum } from '../../../store/enum';
 import { Select, Input, Modal2, InputNumber } from '@gingkoo/pandora';
 import cloneDeep from 'lodash/cloneDeep';
-import { getTemItem } from '../../../store/helper';
 import { buildSqlQuery } from '../../../utils';
+import Formula from '../formula';
 import { AddIcon, CloseIcon } from '../../icons';
 import { Expression, SelectColumnMultiple } from '../../dialog';
+import { customTypes, operatorList, insertTemplateAt, getTemplateItem } from './utils';
 import SelectList from '../../dialog/select-list';
 import arrow from './arrow.svg';
-import { useStore } from '../../../hooks/use-provider';
+import { useStore, Provider } from '../../../hooks/use-provider';
 var FormulaList = forwardRef(function (props, ref) {
   var value = props.value,
     data = props.data,
-    isCustom = props.isCustom,
     exitData = props.exitData,
     onChange = props.onChange,
     _props$customTypes = props.customTypes,
     _customTypes = _props$customTypes === void 0 ? customTypes : _props$customTypes,
     _props$operatorList = props.operatorList,
-    _operatorList = _props$operatorList === void 0 ? operatorList : _props$operatorList;
-  var _useState = useState(value || []),
+    _operatorList = _props$operatorList === void 0 ? operatorList : _props$operatorList,
+    check = props.check;
+  var caseList = value || [];
+  var setCaseList = function setCaseList(data) {
+    var quotes = data.map(function (v, i) {
+      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.val;
+      }
+    }).join(' ');
+    onChange === null || onChange === void 0 || onChange(data, quotes);
+  };
+  var _useState = useState(-1),
     _useState2 = _slicedToArray(_useState, 2),
-    caseList = _useState2[0],
-    setCaseList = _useState2[1];
-  // useEffect(() => {
-  //   setCaseList(value);
-  // }, [value]);
-  var _useState3 = useState(-1),
-    _useState4 = _slicedToArray(_useState3, 2),
-    ind = _useState4[0],
-    setInd = _useState4[1];
+    ind = _useState2[0],
+    setInd = _useState2[1];
   var store = useStore();
   var filterCustomType = store.filterCustomType;
-  useEffect(function () {
-    onChange === null || onChange === void 0 || onChange(caseList);
-  }, [caseList]);
   function closePopup() {
     store.setPopup({
       visible: false
@@ -79,7 +81,7 @@ var FormulaList = forwardRef(function (props, ref) {
     var _caseList = caseList.slice();
     var oldType = _caseList[i].val;
     _caseList[i].val = val;
-    _caseList = getTemplate(oldType, val, _caseList, i);
+    _caseList = insertTemplateAt(oldType, val, _caseList, i);
     setCaseList(_caseList);
   };
   // 表达式
@@ -113,7 +115,7 @@ var FormulaList = forwardRef(function (props, ref) {
   // 添加
   var addOperator = function addOperator(type, index, position) {
     var _caseList = caseList.slice() || [];
-    var temItem = getTemItem(type);
+    var temItem = getTemplateItem(type);
     if (position === 'add') {
       _caseList.push(temItem);
     } else if (position === 'before') {
@@ -195,6 +197,33 @@ var FormulaList = forwardRef(function (props, ref) {
       })
     });
   }
+  // 函数弹窗
+  var showFunction = function showFunction(e, i) {
+    var _value = caseList[i];
+    var o = Modal2.openModal({
+      title: __('customColumn.formula'),
+      transparentMask: true,
+      content: _jsx(_Fragment, {
+        children: _jsx(Provider, {
+          value: store,
+          children: _jsx(Formula, {
+            data: data,
+            value: _value,
+            onCancel: function onCancel() {
+              o.close();
+            },
+            onOk: function onOk(data) {
+              var _caseList = caseList.slice();
+              _caseList[i] = data;
+              setCaseList(_caseList);
+              o.close();
+            }
+          })
+        })
+      }),
+      onClose: function onClose() {}
+    });
+  };
   // 分段
   var itemDom = function itemDom(v, index) {
     var type = v.type;
@@ -312,14 +341,22 @@ var FormulaList = forwardRef(function (props, ref) {
       });
     } else if (type === AtomsTypeEnum.CONSTANT) {
       //常量
-      return _jsx("div", {
+      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')
+        children: [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) {
       // 表达式
@@ -330,7 +367,7 @@ var FormulaList = forwardRef(function (props, ref) {
         onClick: function onClick(e) {
           return handleExpression(e, index, v);
         },
-        children: [!v.quotes && __('customColumn.selectExpression'), v.quotes, _jsx("span", {
+        children: [v.quotes ? v.quotes : __('customColumn.selectExpression'), _jsx("span", {
           style: {
             fontSize: 0
           },
@@ -340,6 +377,23 @@ var FormulaList = forwardRef(function (props, ref) {
           children: _jsx(CloseIcon, {})
         })]
       });
+    } else if (type === AtomsTypeEnum.FORMULA) {
+      // 公式
+      return _jsxs("div", {
+        className: "Sqb-TableName gray-name",
+        onClick: function onClick(e) {
+          return showFunction(e, index);
+        },
+        children: [v.quotes ? v.quotes : __('customColumn.selectFormula'), _jsx("span", {
+          style: {
+            fontSize: 0
+          },
+          onClick: function onClick(e) {
+            return handleDel(e, index);
+          },
+          children: _jsx(CloseIcon, {})
+        })]
+      }, index);
     } else {
       return _jsx(Select, {
         triggerProps: {
@@ -482,7 +536,11 @@ var FormulaList = forwardRef(function (props, ref) {
         })
       })]
     }), _jsxs("p", {
-      className: 'Sqb-NotebookCell-preview',
+      className: "mb-2 font-bold uppercase tracking-wider",
+      style: {
+        fontSize: 12,
+        color: '#949aab'
+      },
       children: ["\u9884\u89C8\uFF1A", caseList.map(function (v, i) {
         if (v !== null && v !== void 0 && v.quotes) {
           return v === null || v === void 0 ? void 0 : v.quotes;

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

@@ -1,3 +1,4 @@
+import { AtomsTypeEnum, AtomsItem } from '../../../store/types';
 /**
  *
  * @param type 当前选择的类型
@@ -5,4 +6,16 @@
  * @param index 需要讲模版插入的位置
  * @returns
  */
-export declare const getTemplate: (oldType: string, type: string, list: any[], index: number) => any[];
+export declare const insertTemplateAt: (oldType: string, type: string, list: any[], index: number) => any[];
+export declare const operatorList: string[];
+export declare const customTypes: ({
+    value: AtomsTypeEnum;
+    label: any;
+    children?: undefined;
+} | {
+    value: AtomsTypeEnum;
+    label: any;
+    children: string[];
+})[];
+export declare const getTemplateItem: (type: AtomsTypeEnum) => AtomsItem;
+export declare const isOk: (rhsVal: AtomsItem[]) => boolean;

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

@@ -1,5 +1,7 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import { __ } from '../../../locale';
 import { AtomsTypeEnum } from '../../../store/types';
+// import { FUNCTION_TEMPLATES } from '../function/utils';
 /**
  *
  * @param type 当前选择的类型
@@ -7,7 +9,7 @@ import { AtomsTypeEnum } from '../../../store/types';
  * @param index 需要讲模版插入的位置
  * @returns
  */
-export var getTemplate = function getTemplate(oldType, type, list, index) {
+export var insertTemplateAt = function insertTemplateAt(oldType, type, list, index) {
   var temList = [];
   var needChange = ['RANK()', 'DENSE_RANK()', 'ROW_NUMBER()', 'when', 'case', 'then'].includes(oldType);
   // 只改变类型不需要插入模版
@@ -116,4 +118,160 @@ export var getTemplate = function getTemplate(oldType, type, list, index) {
   }
   list.splice.apply(list, [index + 1, 0].concat(_toConsumableArray(temList)));
   return list;
-};
+};
+export var operatorList = ['and', 'or', '(', ')', ',', '+', '-', '*', '/', '!=', '<=', '>=', '<', '>', '=', 'case', 'when', 'then', 'else', 'end', 'DESC', 'ASC', 'OVER', 'PARTITION BY', 'ORDER BY', 'RANK()', 'DENSE_RANK()', 'ROW_NUMBER()'];
+export var customTypes = [
+// 字段
+{
+  value: AtomsTypeEnum.FIELD,
+  label: __('customColumn.field')
+},
+// 表达式
+{
+  value: AtomsTypeEnum.EXPRESSION,
+  label: __('customColumn.expression')
+},
+// 输入框
+{
+  value: AtomsTypeEnum.INPUT_STRING,
+  label: __('customColumn.input')
+},
+// 数字输入框
+{
+  value: AtomsTypeEnum.INPUT_NUMBER,
+  label: __('customColumn.numberInput')
+},
+// 数字输入框
+{
+  value: AtomsTypeEnum.CONSTANT,
+  label: __('customColumn.constant')
+},
+// 连接符
+{
+  value: AtomsTypeEnum.OPERATOR,
+  label: __('customColumn.operator'),
+  children: operatorList
+},
+// 函数
+{
+  value: AtomsTypeEnum.FORMULA,
+  label: __('customColumn.formula'),
+  children: operatorList
+}];
+export var getTemplateItem = function getTemplateItem(type) {
+  var temItem;
+  // 字段
+  if (type === AtomsTypeEnum.FIELD) {
+    temItem = {
+      fieldName: '',
+      // 字段名
+      fieldNameZh: '',
+      // 字段中文名
+      fieldAlias: '',
+      // 别名
+      fieldUuid: '',
+      // uuid
+      fieldId: '',
+      // 字段id
+      // quotes?: string; // 字段展示的 不知道有没有用
+      tableName: '',
+      // 表名
+      tableNameZh: '',
+      tableId: '',
+      // 表名
+      tableAlias: '',
+      // 别名
+      tableUuid: '',
+      // 表唯一标识
+      datasourceName: '',
+      // 数据源名
+      datasourceId: '',
+      // 数据源id
+      type: AtomsTypeEnum.FIELD
+    };
+  }
+  // 表达式
+  else if (type === AtomsTypeEnum.EXPRESSION || type === AtomsTypeEnum.JOIN_DEFAULT) {
+    return {
+      lhs: [],
+      rhs: [],
+      condition: '',
+      quotes: '',
+      type: type
+    };
+  } else if (type === AtomsTypeEnum.EXISTS || type === AtomsTypeEnum.NOT_EXISTS) {
+    return {
+      quotes: '',
+      // 展示用户看的 组装的文字
+      notExists: [],
+      type: type
+    };
+  } else if (type === AtomsTypeEnum.UNKNOWN) {
+    return {
+      // quotes: '', // 展示用户看的 组装的文字
+      // notExists: [],
+      val: '',
+      type: type
+    };
+  } else if (type === AtomsTypeEnum.INPUT_NUMBER) {
+    return {
+      val: 0,
+      type: type
+    };
+  } else if (type === AtomsTypeEnum.INPUT_NUMBER_LIST || type === AtomsTypeEnum.INPUT_STRING_LIST) {
+    temItem = {
+      val: [],
+      type: type
+    };
+  } else if (type === AtomsTypeEnum.FORMULA) {
+    temItem = {
+      args: [],
+      // params: FUNCTION_TEMPLATES?.[type]?.params || [],
+      // arity: FUNCTION_TEMPLATES?.[type]?.arity || {},
+      name: '',
+      quotes: '',
+      type: type
+    };
+  } else if (type === AtomsTypeEnum.COLLECTION) {
+    return {
+      list: [],
+      quotes: '',
+      type: type
+    };
+  } else {
+    // 其他
+    temItem = {
+      val: '',
+      type: type
+    };
+  }
+  return temItem;
+};
+var _isOk = function isOk(rhsVal) {
+  return rhsVal.every(function (v) {
+    if (v.type === AtomsTypeEnum.UNKNOWN) {
+      return false;
+    } else if (v.type === AtomsTypeEnum.JOIN_DEFAULT) {
+      // 这个情况应该是不存在的
+      return true; // 或者根据业务逻辑决定是否算“有效”
+    } else if (v.type === AtomsTypeEnum.FIELD) {
+      return Boolean(v.fieldName); // 确保 fieldName 存在且非空
+    } else if (v.type === AtomsTypeEnum.EXPRESSION || v.type === AtomsTypeEnum.EXISTS || v.type === AtomsTypeEnum.NOT_EXISTS) {
+      return Boolean(v.quotes); // 确保 quotes 存在
+    } else if (v.type === AtomsTypeEnum.INPUT_STRING_LIST) {
+      return Array.isArray(v.val) && v.val.every(function (vv) {
+        return Boolean(vv);
+      });
+    } else if (v.type === AtomsTypeEnum.COLLECTION) {
+      return _isOk(v.list || []);
+    } else if (v.type === AtomsTypeEnum.FORMULA) {
+      if (!v.quotes) {
+        return false;
+      }
+      return _isOk(v.args || []);
+    } else {
+      return Boolean(v.val); // 兜底，确保 val 存在
+    }
+  });
+};
+export { _isOk as isOk };

package/lib/es/components/metabase/index.less

@@ -152,6 +152,7 @@
           -webkit-box-align: center;
           align-items: center;
           cursor: pointer;
+          height: 36px;
           // &-OPERATOR {
           //   // 操作符
           //   background-color: var(--link-5);

package/lib/es/components/modules/enum/filter-enum.d.ts

@@ -28,7 +28,12 @@ export declare enum FunctionEnum {
     'COALESCE' = "coalesce"
 }
 export declare const operatorList: string[];
-export declare const customTypes: {
+export declare const customTypes: ({
     value: AtomsTypeEnum;
     label: any;
-}[];
+    children?: undefined;
+} | {
+    value: AtomsTypeEnum;
+    label: any;
+    children: string[];
+})[];

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

@@ -98,12 +98,12 @@ export var customTypes = [
 // 输入框
 {
   value: AtomsTypeEnum.INPUT_STRING,
-  label: __('SqlQueryBuilder.input')
+  label: __('customColumn.input')
 },
 // 数字输入框
 {
   value: AtomsTypeEnum.INPUT_NUMBER,
-  label: __('SqlQueryBuilder.numberInput')
+  label: __('customColumn.numberInput')
 },
 // 表达式
 {
@@ -115,6 +115,12 @@ export var customTypes = [
   value: AtomsTypeEnum.OPERATOR,
   label: __('customColumn.operator')
 },
+// 函数
+{
+  value: AtomsTypeEnum.FORMULA,
+  label: __('customColumn.formula'),
+  children: operatorList
+},
 // EXISTS
 {
   value: AtomsTypeEnum.NOT_EXISTS,

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

@@ -687,10 +687,10 @@ var JoinData = function JoinData(props) {
         // value={(((newMeta[index] as MetaJoin).expressions[_ind] as AtomsExpression)[position])[`type`]}
         list: [{
           value: AtomsTypeEnum.INPUT_STRING,
-          label: __('SqlQueryBuilder.input')
+          label: __('customColumn.input')
         }, {
           value: AtomsTypeEnum.INPUT_NUMBER,
-          label: __('SqlQueryBuilder.numberInput')
+          label: __('customColumn.numberInput')
         }, {
           value: AtomsTypeEnum.CONSTANT,
           label: __('customColumn.constant')
@@ -1356,6 +1356,31 @@ var JoinData = function JoinData(props) {
                 })]
               }, i);
             }
+            // if (v.type === AtomsTypeEnum.COLLECTION) {
+            //   return (
+            //     <FormulaList
+            //       // check={formulaList?.[fun.name]?.args?.[i]?.check || ''}
+            //       value={v.list}
+            //       data={data}
+            //       ref={ref}
+            //       onChange={(data, _quotes) => {
+            //         const _args = cloneDeep(fun.args);
+            //         (_args[i] as AtomsCollection).list = data;
+            //         (_args[i] as AtomsCollection).quotes = _quotes || '';
+            //         const quotes = (_args as AtomsCollection[])
+            //           .map((v) => {
+            //             return v.quotes;
+            //           })
+            //           .join(' , ');
+            //         setFun({
+            //           ...fun,
+            //           quotes: fun.name + ' ( ' + quotes + ' ) ',
+            //           args: _args,
+            //         });
+            //       }}
+            //     ></FormulaList>
+            //   );
+            // }
           })), ((_meta$table9 = meta.table2) === null || _meta$table9 === void 0 ? void 0 : _meta$table9.name) && ((_meta$table0 = meta.table1) === null || _meta$table0 === void 0 ? void 0 : _meta$table0.name) && (((_meta$expressions2 = meta.expressions) === null || _meta$expressions2 === void 0 ? void 0 : _meta$expressions2.length) || 0) < 1 && _jsx(Tooltip, {
             title: __('SqlQueryBuilder.add'),
             children: _jsx(Dropdown, {