@gingkoo/pandora-metabase 1.0.42 → 1.0.44

package/lib/cjs/components/dialog/select-column-multiple/index.js

@@ -158,6 +158,18 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
         return v.fieldId != (val === null || val === void 0 ? void 0 : val.fieldId);
       });
     }
+    // 当前选中的表字段
+    var curTableColumn = data.filter(function (v) {
+      return v.tableUuid === curTable;
+    }).flatMap(function (v) {
+      return v.columns;
+    });
+    // 过滤选中字段不在当前选中的表字段中，
+    _value = _value.filter(function (item2) {
+      return curTableColumn.some(function (item1) {
+        return item1.name === item2.fieldName;
+      });
+    });
     setValue(_value);
     setCurTable(tableUuid);
     onSelect === null || onSelect === void 0 || onSelect(_value, getQuotes(_value));

package/lib/cjs/components/dialog/select-permission-table/index.js

@@ -10,6 +10,8 @@ var _jsxRuntime = require("react/jsx-runtime");
 require("./index.less");
 var _react = require("react");
 var _classnames = _interopRequireDefault(require("classnames"));
+var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
+var _locale = require("../../../locale");
 var _icons = require("../../icons");
 /**
  * 选择表弹框
@@ -26,22 +28,45 @@ var SelectPermissionTable = function SelectPermissionTable(_ref) {
     onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange,
     didUpdate = _ref.didUpdate;
   var _useState = (0, _react.useState)(data.slice()),
-    _useState2 = (0, _slicedToArray2["default"])(_useState, 1),
-    datasource = _useState2[0];
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    datasource = _useState2[0],
+    setDatasource = _useState2[1];
   (0, _react.useEffect)(function () {
     didUpdate === null || didUpdate === void 0 || didUpdate();
   }, [datasource]);
+  function onInput(e) {
+    var val = e.target.value;
+    var newList = (0, _cloneDeep["default"])(data.slice());
+    setDatasource(newList.filter(function (v) {
+      return ~(v.datasourceName + '.' + (v.alias || v.name)).toLocaleLowerCase().indexOf(val.toLocaleLowerCase());
+    }));
+  }
   return (0, _jsxRuntime.jsx)("div", {
     className: (0, _classnames["default"])("Sqb-SelectTable--box pb-2 pt-2"),
     children: (0, _jsxRuntime.jsx)("div", {
       style: {
         width: 300
       },
-      children: (0, _jsxRuntime.jsx)("div", {
+      children: (0, _jsxRuntime.jsxs)("div", {
         style: {
           width: '100%'
         },
-        children: Array.isArray(datasource) && datasource.map(function (v) {
+        children: [(0, _jsxRuntime.jsx)("div", {
+          className: (0, _classnames["default"])("Sqb-List-section"),
+          children: (0, _jsxRuntime.jsxs)("div", {
+            className: (0, _classnames["default"])("Sqb-List-search m-2 rounded-lg"),
+            children: [(0, _jsxRuntime.jsx)("span", {
+              className: 'px-2',
+              children: (0, _jsxRuntime.jsx)(_icons.SearchIcon, {})
+            }), (0, _jsxRuntime.jsx)("input", {
+              autoFocus: true,
+              type: 'text',
+              className: 'p-2',
+              placeholder: (0, _locale.__)('data.search'),
+              onInput: onInput
+            })]
+          })
+        }), Array.isArray(datasource) && datasource.map(function (v) {
           return (0, _jsxRuntime.jsx)("div", {
             className: (0, _classnames["default"])("Sqb-List-section"),
             children: (0, _jsxRuntime.jsx)("div", {
@@ -65,7 +90,7 @@ var SelectPermissionTable = function SelectPermissionTable(_ref) {
               })
             })
           }, v.alias || v.name);
-        })
+        })]
       })
     })
   });

package/lib/cjs/components/dialog/select-table/index.js

@@ -189,6 +189,7 @@ var SelectTable = function SelectTable(_ref) {
                 className: 'px-2',
                 children: (0, _jsxRuntime.jsx)(_icons.SearchIcon, {})
               }), (0, _jsxRuntime.jsx)("input", {
+                autoFocus: true,
                 type: 'text',
                 className: 'p-2',
                 placeholder: (0, _locale.__)('data.search'),

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

@@ -1226,7 +1226,6 @@ var JoinData = function JoinData(props) {
     var index = (0, _utils.findIndex)(store.metaList[groupIndex].list, meta);
     var newMeta = store.metaList[groupIndex].list.slice();
     var item = (0, _dialog.getTemplateItem)(type);
-    console.log('🚀 ~ addExpression ~ item:', item);
     if (type === _types.AtomsTypeEnum.JOIN_DEFAULT) {
       item = {
         lhs: [{

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

@@ -269,9 +269,7 @@ var useStore = function useStore() {
             _columns = (_columns2 = columns) === null || _columns2 === void 0 ? void 0 : _columns2.map(function (v) {
               var select = selectId.includes(v.id);
               var obj = {};
-              if (select) {
-                obj = oldObj[v.id];
-              }
+              obj = oldObj[v.id] || {};
               return (0, _objectSpread2["default"])((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, obj), v), {}, {
                 select: select,
                 fieldUuid: obj.fieldUuid || v.fieldUuid || (0, _helper.uuidv4)('field')

package/lib/cjs/utils.js

@@ -713,7 +713,10 @@ var _isError = exports.isError = function isError(item, data) {
       }
     } else {
       var _tables$_datasourceId3;
-      return !(tables !== null && tables !== void 0 && (_tables$_datasourceId3 = tables[_datasourceId]) !== null && _tables$_datasourceId3 !== void 0 && _tables$_datasourceId3[tableId]); // 注意：返回 true 表示“有错误”
+      var hasField = (tables === null || tables === void 0 || (_tables$_datasourceId3 = tables[_datasourceId]) === null || _tables$_datasourceId3 === void 0 || (_tables$_datasourceId3 = _tables$_datasourceId3[tableId]) === null || _tables$_datasourceId3 === void 0 || (_tables$_datasourceId3 = _tables$_datasourceId3.filter(function (v) {
+        return v.name === fieldName;
+      })) === null || _tables$_datasourceId3 === void 0 ? void 0 : _tables$_datasourceId3.length) > 0;
+      return !hasField; // 注意：返回 true 表示“有错误”
     }
   }
   // 表达式类型

package/lib/es/components/dialog/select-column-multiple/index.js

@@ -152,6 +152,18 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
         return v.fieldId != (val === null || val === void 0 ? void 0 : val.fieldId);
       });
     }
+    // 当前选中的表字段
+    var curTableColumn = data.filter(function (v) {
+      return v.tableUuid === curTable;
+    }).flatMap(function (v) {
+      return v.columns;
+    });
+    // 过滤选中字段不在当前选中的表字段中，
+    _value = _value.filter(function (item2) {
+      return curTableColumn.some(function (item1) {
+        return item1.name === item2.fieldName;
+      });
+    });
     setValue(_value);
     setCurTable(tableUuid);
     onSelect === null || onSelect === void 0 || onSelect(_value, getQuotes(_value));

package/lib/es/components/dialog/select-permission-table/index.js

@@ -8,7 +8,9 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import './index.less';
 import { useState, useEffect } from 'react';
 import cx from 'classnames';
-import { TableIcon } from '../../icons';
+import cloneDeep from 'lodash/cloneDeep';
+import { __ } from '../../../locale';
+import { TableIcon, SearchIcon } from '../../icons';
 var PrevResult = 'Previous results';
 var SelectPermissionTable = function SelectPermissionTable(_ref) {
   var _ref$data = _ref.data,
@@ -18,22 +20,45 @@ var SelectPermissionTable = function SelectPermissionTable(_ref) {
     onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange,
     didUpdate = _ref.didUpdate;
   var _useState = useState(data.slice()),
-    _useState2 = _slicedToArray(_useState, 1),
-    datasource = _useState2[0];
+    _useState2 = _slicedToArray(_useState, 2),
+    datasource = _useState2[0],
+    setDatasource = _useState2[1];
   useEffect(function () {
     didUpdate === null || didUpdate === void 0 || didUpdate();
   }, [datasource]);
+  function onInput(e) {
+    var val = e.target.value;
+    var newList = cloneDeep(data.slice());
+    setDatasource(newList.filter(function (v) {
+      return ~(v.datasourceName + '.' + (v.alias || v.name)).toLocaleLowerCase().indexOf(val.toLocaleLowerCase());
+    }));
+  }
   return _jsx("div", {
     className: cx("Sqb-SelectTable--box pb-2 pt-2"),
     children: _jsx("div", {
       style: {
         width: 300
       },
-      children: _jsx("div", {
+      children: _jsxs("div", {
         style: {
           width: '100%'
         },
-        children: Array.isArray(datasource) && datasource.map(function (v) {
+        children: [_jsx("div", {
+          className: cx("Sqb-List-section"),
+          children: _jsxs("div", {
+            className: cx("Sqb-List-search m-2 rounded-lg"),
+            children: [_jsx("span", {
+              className: 'px-2',
+              children: _jsx(SearchIcon, {})
+            }), _jsx("input", {
+              autoFocus: true,
+              type: 'text',
+              className: 'p-2',
+              placeholder: __('data.search'),
+              onInput: onInput
+            })]
+          })
+        }), Array.isArray(datasource) && datasource.map(function (v) {
           return _jsx("div", {
             className: cx("Sqb-List-section"),
             children: _jsx("div", {
@@ -57,7 +82,7 @@ var SelectPermissionTable = function SelectPermissionTable(_ref) {
               })
             })
           }, v.alias || v.name);
-        })
+        })]
       })
     })
   });

package/lib/es/components/dialog/select-table/index.js

@@ -182,6 +182,7 @@ var SelectTable = function SelectTable(_ref) {
                 className: 'px-2',
                 children: _jsx(SearchIcon, {})
               }), _jsx("input", {
+                autoFocus: true,
                 type: 'text',
                 className: 'p-2',
                 placeholder: __('data.search'),

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

@@ -1221,7 +1221,6 @@ var JoinData = function JoinData(props) {
     var index = findIndex(store.metaList[groupIndex].list, meta);
     var newMeta = store.metaList[groupIndex].list.slice();
     var item = getTemplateItem(type);
-    console.log('🚀 ~ addExpression ~ item:', item);
     if (type === AtomsTypeEnum.JOIN_DEFAULT) {
       item = {
         lhs: [{

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

@@ -262,9 +262,7 @@ var useStore = function useStore() {
             _columns = (_columns2 = columns) === null || _columns2 === void 0 ? void 0 : _columns2.map(function (v) {
               var select = selectId.includes(v.id);
               var obj = {};
-              if (select) {
-                obj = oldObj[v.id];
-              }
+              obj = oldObj[v.id] || {};
               return _objectSpread(_objectSpread(_objectSpread({}, obj), v), {}, {
                 select: select,
                 fieldUuid: obj.fieldUuid || v.fieldUuid || uuidv4('field')

package/lib/es/utils.js

@@ -702,7 +702,10 @@ var _isError = function isError(item, data) {
       }
     } else {
       var _tables$_datasourceId3;
-      return !(tables !== null && tables !== void 0 && (_tables$_datasourceId3 = tables[_datasourceId]) !== null && _tables$_datasourceId3 !== void 0 && _tables$_datasourceId3[tableId]); // 注意：返回 true 表示“有错误”
+      var hasField = (tables === null || tables === void 0 || (_tables$_datasourceId3 = tables[_datasourceId]) === null || _tables$_datasourceId3 === void 0 || (_tables$_datasourceId3 = _tables$_datasourceId3[tableId]) === null || _tables$_datasourceId3 === void 0 || (_tables$_datasourceId3 = _tables$_datasourceId3.filter(function (v) {
+        return v.name === fieldName;
+      })) === 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.42",
+  "version": "1.0.44",
   "description": "",
   "main": "lib/es/index.js",
   "module": "lib/es/index.js",