@gingkoo/pandora-metabase 1.0.140 → 1.0.141-alpha.5

package/README.md

@@ -73,9 +73,8 @@ export interface OptionItem {
 }
 
 export interface SqlVisionBuilderRef {
-  setDatasource: (list: DatasourceType[]) => void; // 设置数据源列表
-  setPreData: (data: MetaListType[]) => void; // 设置回显数据
   reset: () => void; // 重置到上次设置的数据
+  getConfig: () => MetaListType[]; // 获取当前最新配置
 }
 
 ```
@@ -126,4 +125,4 @@ export interface SqlVisionBuilderRef {
 			console.log(v);
 		}}
 	/>
-```
+```

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

@@ -1,10 +1,13 @@
 import React from 'react';
 type Props = {
-    operator: 'and' | 'or';
-    onToggleOperator: () => void;
-    leftContent: React.ReactNode;
-    rightContent: React.ReactNode;
+    items: {
+        operator?: 'and' | 'or';
+        content: React.ReactNode;
+    }[];
+    onChangeOperator: (index: number, operator: 'and' | 'or') => void;
+    onAddItem: () => void;
+    onDeleteItem: (operatorIndex: number, side: 'left' | 'right') => void;
     onDelete: (e: any) => void;
 };
-declare const LogicGroup: ({ operator, onToggleOperator, leftContent, rightContent, onDelete, }: Props) => import("react/jsx-runtime").JSX.Element;
+declare const LogicGroup: ({ items, onChangeOperator, onAddItem, onDeleteItem, onDelete, }: Props) => import("react/jsx-runtime").JSX.Element;
 export default LogicGroup;

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

@@ -5,35 +5,81 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _jsxRuntime = require("react/jsx-runtime");
+var _react = _interopRequireDefault(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _pandora = require("@gingkoo/pandora");
 var _icons = require("../../icons");
+var operatorMenuItems = [{
+  key: 'add',
+  label: '添加连接符'
+}, {
+  key: 'delete-left',
+  label: '删除左侧和当前连接符'
+}, {
+  key: 'delete-right',
+  label: '删除右侧和当前连接符'
+}];
 var LogicGroup = function LogicGroup(_ref) {
-  var operator = _ref.operator,
-    onToggleOperator = _ref.onToggleOperator,
-    leftContent = _ref.leftContent,
-    rightContent = _ref.rightContent,
+  var items = _ref.items,
+    onChangeOperator = _ref.onChangeOperator,
+    onAddItem = _ref.onAddItem,
+    onDeleteItem = _ref.onDeleteItem,
     onDelete = _ref.onDelete;
+  var canDeleteItem = items.length > 2;
+  var handleOperatorMenuChange = function handleOperatorMenuChange(operatorIndex, action) {
+    if (action === 'add') {
+      onAddItem();
+      return;
+    }
+    if (action === 'delete-left' || action === 'delete-right') {
+      var side = action === 'delete-left' ? 'left' : 'right';
+      onDeleteItem(operatorIndex, side);
+    }
+  };
+  var renderOperator = function renderOperator(operator, index) {
+    return (0, _jsxRuntime.jsx)(_pandora.Dropdown, {
+      trigger: 'contextMenu',
+      droplist: operatorMenuItems.map(function (item) {
+        return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, item), {}, {
+          disabled: item.key !== 'add' && !canDeleteItem
+        });
+      }),
+      triggerProps: {
+        clickToClose: true,
+        style: {
+          zIndex: 9999
+        }
+      },
+      onChange: function onChange(action) {
+        handleOperatorMenuChange(index, action);
+      },
+      children: (0, _jsxRuntime.jsx)("button", {
+        type: 'button',
+        className: (0, _classnames["default"])(':Sqb-TableName', 'operator-trigger', 'logic-operator', {
+          'logic-and': operator === 'and',
+          'logic-or': operator === 'or'
+        }),
+        onClick: function onClick() {
+          return onChangeOperator(index, operator === 'or' ? 'and' : 'or');
+        },
+        children: operator
+      })
+    });
+  };
   return (0, _jsxRuntime.jsxs)("div", {
     className: (0, _classnames["default"])('Sqb-FormulaGroup', 'logic-group', 'formula-node-group'),
     children: [(0, _jsxRuntime.jsx)("span", {
       className: 'Sqb-CaseKeyword',
       children: "("
-    }), (0, _jsxRuntime.jsx)("div", {
-      className: 'Sqb-LogicGroup-content',
-      children: leftContent
-    }), (0, _jsxRuntime.jsx)("button", {
-      type: 'button',
-      className: (0, _classnames["default"])('Sqb-TableName', 'operator-trigger', 'logic-operator', {
-        'logic-and': operator === 'and',
-        'logic-or': operator === 'or'
-      }),
-      onClick: onToggleOperator,
-      children: operator
-    }), (0, _jsxRuntime.jsx)("div", {
-      className: 'Sqb-LogicGroup-content',
-      children: rightContent
+    }), items.map(function (item, index) {
+      return (0, _jsxRuntime.jsxs)(_react["default"].Fragment, {
+        children: [index > 0 && renderOperator(item.operator || 'and', index), (0, _jsxRuntime.jsx)("div", {
+          className: 'Sqb-LogicGroup-content',
+          children: item.content
+        })]
+      }, index);
     }), (0, _jsxRuntime.jsx)("span", {
       className: 'Sqb-CaseKeyword',
       children: ")"