@gingkoo/pandora-metabase 1.0.87 → 1.0.89

package/lib/cjs/common/SplitView/index.js

@@ -15,7 +15,8 @@ var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _winsize = require("../../hooks/winsize");
 var _templateObject;
-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); }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 var StyledSashHorizontal = _styledComponents["default"].div.attrs({
   className: 'view-sash horizontal'
 })(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  top: ", ";\n"])), function (props) {
@@ -60,17 +61,17 @@ var SplitView = _react["default"].forwardRef(function (props, ref) {
     hMaximum = _useState8[0],
     setHMaximum = _useState8[1];
   var _useState9 = (0, _react.useState)(false),
-    _useState0 = (0, _slicedToArray2["default"])(_useState9, 2),
-    vMinimum = _useState0[0],
-    setVMinimum = _useState0[1];
-  var _useState1 = (0, _react.useState)(false),
-    _useState10 = (0, _slicedToArray2["default"])(_useState1, 2),
-    vMaximum = _useState10[0],
-    setVMaximum = _useState10[1];
-  var _useState11 = (0, _react.useState)(0),
+    _useState10 = (0, _slicedToArray2["default"])(_useState9, 2),
+    vMinimum = _useState10[0],
+    setVMinimum = _useState10[1];
+  var _useState11 = (0, _react.useState)(false),
     _useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
-    bottomHeight = _useState12[0],
-    setBottomHeight = _useState12[1];
+    vMaximum = _useState12[0],
+    setVMaximum = _useState12[1];
+  var _useState13 = (0, _react.useState)(0),
+    _useState14 = (0, _slicedToArray2["default"])(_useState13, 2),
+    bottomHeight = _useState14[0],
+    setBottomHeight = _useState14[1];
   _react["default"].useImperativeHandle(ref, function () {
     return {
       open: function open() {

package/lib/cjs/components/dialog/custom-column/expression-editor.js

@@ -18,7 +18,8 @@ var _popup = _interopRequireDefault(require("../../popup"));
 var _selectList = _interopRequireDefault(require("./dialog/select-list"));
 var _functionTip = _interopRequireDefault(require("./dialog/function-tip"));
 var _useProvider = require("../../../hooks/use-provider");
-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); }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 var ErrorMessage = function ErrorMessage(_ref) {
   var msg = _ref.msg;
   if (!msg) return null;

package/lib/cjs/components/dialog/custom-column/tokenizedI-input.js

@@ -20,7 +20,8 @@ var _reactDom = _interopRequireDefault(require("react-dom"));
 var _server = _interopRequireDefault(require("react-dom/server"));
 var _selection = require("../../../utils/selection");
 var _tokenizedExpression = _interopRequireDefault(require("./tokenized-expression"));
-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); }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, (0, _isNativeReflectConstruct2["default"])() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
 var TokenizedInput = /*#__PURE__*/function (_React$Component) {
   function TokenizedInput() {

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

@@ -25,7 +25,8 @@ var _selectColumnMultiple = _interopRequireDefault(require("../select-column-mul
 var _icons = require("../../icons");
 var _useProvider = require("../../../hooks/use-provider");
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
-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); }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 /**
  * 关联模块 选择表字段
  */
@@ -88,18 +89,18 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
     special_type = _useState8[0],
     setSpecial_type = _useState8[1];
   var _useState9 = (0, _react.useState)(value.formula || {}),
-    _useState0 = (0, _slicedToArray2["default"])(_useState9, 2),
-    formula = _useState0[0],
-    setFormula = _useState0[1];
+    _useState10 = (0, _slicedToArray2["default"])(_useState9, 2),
+    formula = _useState10[0],
+    setFormula = _useState10[1];
   var store = (0, _useProvider.useStore)();
-  var _useState1 = (0, _react.useState)(false),
-    _useState10 = (0, _slicedToArray2["default"])(_useState1, 2),
-    popupVisible = _useState10[0],
-    setPopupVisible = _useState10[1];
-  var _useState11 = (0, _react.useState)((value === null || value === void 0 || (_value$lhs = value.lhs) === null || _value$lhs === void 0 ? void 0 : _value$lhs.length) > 0 || false),
+  var _useState11 = (0, _react.useState)(false),
     _useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
-    isNext = _useState12[0],
-    setIsNext = _useState12[1];
+    popupVisible = _useState12[0],
+    setPopupVisible = _useState12[1];
+  var _useState13 = (0, _react.useState)((value === null || value === void 0 || (_value$lhs = value.lhs) === null || _value$lhs === void 0 ? void 0 : _value$lhs.length) > 0 || false),
+    _useState14 = (0, _slicedToArray2["default"])(_useState13, 2),
+    isNext = _useState14[0],
+    setIsNext = _useState14[1];
   var table2Selected = Boolean(rhsVal && (rhsVal === null || rhsVal === void 0 ? void 0 : rhsVal.length) > 0);
   var disabled = (0, _react.useMemo)(function () {
     if (!condition) return true;

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

@@ -24,18 +24,23 @@ var _pandora = require("@gingkoo/pandora");
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 var _useProvider = require("../../../hooks/use-provider");
 var _templateObject; // import { OptionsTypeEnum, customTypes, otherList, operatorList, functionList } from './enum';
-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); }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 var VisualBox = _styledComponents["default"].div.attrs({
   className: 'visual-box'
 })(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])([""])));
 var CaseEditor = _react["default"].forwardRef(function (props, ref) {
-  var _store$formulaTemplat, _fun$args;
+  var _store$formulaTemplat, _formulaList$fun$name, _formulaList$fun$name2, _fun$args;
   var store = (0, _useProvider.useStore)();
   var value = props.value,
     data = props.data,
     onOk = props.onOk,
     onCancel = props.onCancel;
-  var _useState = (0, _react.useState)(value),
+  var _useState = (0, _react.useState)(function () {
+      return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, value), {}, {
+        id: value.id || value.name
+      });
+    }),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     fun = _useState2[0],
     setFun = _useState2[1];
@@ -80,13 +85,15 @@ var CaseEditor = _react["default"].forwardRef(function (props, ref) {
     })));
   };
   // 选择公式名
-  var handleFunName = function handleFunName(name) {
-    var _formulaList$name, _formulaList$name2;
+  var handleFunName = function handleFunName(id) {
+    var _formulaList$id, _formulaList$id2, _formulaList$id3;
+    var isId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     // formulaList?.[name].args;
     setFun((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, fun), {}, {
-      args: (0, _utils2.getTemArgs)(formulaList === null || formulaList === void 0 ? void 0 : formulaList[name].args, formulaList === null || formulaList === void 0 || (_formulaList$name = formulaList[name]) === null || _formulaList$name === void 0 ? void 0 : _formulaList$name.arity),
-      arity: formulaList === null || formulaList === void 0 || (_formulaList$name2 = formulaList[name]) === null || _formulaList$name2 === void 0 ? void 0 : _formulaList$name2.arity,
-      name: name
+      args: (0, _utils2.getTemArgs)(formulaList === null || formulaList === void 0 ? void 0 : formulaList[id].args, formulaList === null || formulaList === void 0 || (_formulaList$id = formulaList[id]) === null || _formulaList$id === void 0 ? void 0 : _formulaList$id.arity),
+      arity: formulaList === null || formulaList === void 0 || (_formulaList$id2 = formulaList[id]) === null || _formulaList$id2 === void 0 ? void 0 : _formulaList$id2.arity,
+      id: id,
+      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) {
@@ -147,7 +154,7 @@ var CaseEditor = _react["default"].forwardRef(function (props, ref) {
                 triggerProps: {
                   clickToClose: true
                 },
-                value: fun.name,
+                value: fun.id || fun.name,
                 triggerElement: function triggerElement(value) {
                   return (0, _jsxRuntime.jsx)("div", {
                     className: (0, _classnames["default"])("Sqb-TableName Sqb-TableName-OPERATOR", {
@@ -164,9 +171,9 @@ var CaseEditor = _react["default"].forwardRef(function (props, ref) {
                     label: options.name,
                     children: Array.from(options.children || []).map(function (option, ind) {
                       return (0, _jsxRuntime.jsx)(_pandora.Select.Option, {
-                        value: option.name,
+                        value: option.id,
                         children: option.name
-                      }, String(option.name + ind));
+                      }, option.id || String(option.name + ind));
                     })
                   }, index);
                   // <Select.Option key={index} value={option.name}>
@@ -181,14 +188,14 @@ var CaseEditor = _react["default"].forwardRef(function (props, ref) {
                 color: '#949aab'
               },
               children: [(0, _jsxRuntime.jsxs)("p", {
-                children: ["\u63CF\u8FF0\uFF1A", formulaList[fun.name].description]
+                children: ["\u63CF\u8FF0\uFF1A", (_formulaList$fun$name = formulaList[fun.name]) === null || _formulaList$fun$name === void 0 ? void 0 : _formulaList$fun$name.description]
               }), (0, _jsxRuntime.jsxs)("p", {
-                children: ["\u6848\u4F8B\uFF1A", formulaList[fun.name].example]
+                children: ["\u6848\u4F8B\uFF1A", (_formulaList$fun$name2 = formulaList[fun.name]) === null || _formulaList$fun$name2 === void 0 ? void 0 : _formulaList$fun$name2.example]
               })]
             })]
           }), fun === null || fun === void 0 || (_fun$args = fun.args) === null || _fun$args === void 0 ? void 0 : _fun$args.map(function (v, i) {
             if (v.type === _types.AtomsTypeEnum.COLLECTION) {
-              var _formulaList$fun$name;
+              var _formulaList$fun$name3;
               return (0, _jsxRuntime.jsxs)("div", {
                 className: 'Sqb-item-formula-args',
                 children: [(0, _jsxRuntime.jsxs)("div", {
@@ -201,7 +208,7 @@ var CaseEditor = _react["default"].forwardRef(function (props, ref) {
                     },
                     children: ["\u53C2\u6570", i + 1, ":"]
                   }), (0, _jsxRuntime.jsx)(_formulaList["default"], {
-                    check: (formulaList === null || formulaList === void 0 || (_formulaList$fun$name = formulaList[fun.name]) === null || _formulaList$fun$name === void 0 || (_formulaList$fun$name = _formulaList$fun$name.args) === null || _formulaList$fun$name === void 0 || (_formulaList$fun$name = _formulaList$fun$name[i]) === null || _formulaList$fun$name === void 0 ? void 0 : _formulaList$fun$name.check) || '',
+                    check: (formulaList === null || formulaList === void 0 || (_formulaList$fun$name3 = formulaList[fun.name]) === null || _formulaList$fun$name3 === void 0 || (_formulaList$fun$name3 = _formulaList$fun$name3.args) === null || _formulaList$fun$name3 === void 0 || (_formulaList$fun$name3 = _formulaList$fun$name3[i]) === null || _formulaList$fun$name3 === void 0 ? void 0 : _formulaList$fun$name3.check) || '',
                     value: v.list,
                     data: data,
                     ref: _ref,

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

@@ -12,8 +12,11 @@ var getObjTem = exports.getObjTem = function getObjTem(arr) {
   var obj = {};
   arr === null || arr === void 0 || arr.map(function (v) {
     v.children.map(function (vv) {
-      if (vv.name) {
-        obj[vv.name] = vv;
+      // if (vv.name) {
+      //   obj[vv.name] = vv;
+      // }
+      if (vv.id) {
+        obj[vv.id] = vv;
       }
     });
   });

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

@@ -37,7 +37,8 @@ var _diffViewer = _interopRequireDefault(require("../diff-viewer"));
 var _storage = _interopRequireDefault(require("../../../utils/storage"));
 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); }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 var FormulaList = (0, _react.forwardRef)(function (props, ref) {
   var _storage$_metabaseCop, _caseList2;
   // 响应 storage._metabaseCopyItems 变化，保证粘贴按钮能实时显示
@@ -98,9 +99,9 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     setOldCode(getPreviewStr(caseList));
   }, []);
   var _useState9 = (0, _react.useState)(''),
-    _useState0 = (0, _slicedToArray2["default"])(_useState9, 2),
-    filterVal = _useState0[0],
-    setFilterVal = _useState0[1];
+    _useState10 = (0, _slicedToArray2["default"])(_useState9, 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 +116,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 === '(';
@@ -381,7 +382,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
       onOk: function () {
         var _onOk = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
           var _caseList;
-          return _regenerator["default"].wrap(function (_context) {
+          return _regenerator["default"].wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
                 _caseList = caseList.slice(); // 删除选中项，selectedIndices 已经是排序好的了
@@ -390,7 +391,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
                 });
                 setCaseList(_caseList);
                 initPaste();
-              case 1:
+              case 4:
               case "end":
                 return _context.stop();
             }
@@ -955,6 +956,9 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
               style: {
                 pointerEvents: isCheck || store.isMetabaseCopy ? 'none' : 'auto'
               },
+              className: (0, _classnames["default"])({
+                openCheck: isCheck
+              }),
               children: itemDom(v, i)
             }), selectOperator({
               triggerElement: function triggerElement(value) {

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

@@ -35,6 +35,11 @@
   //     transform: none;
   //   }
   // }
+  .openCheck {
+    .Sqb-TableName {
+      padding-left: 20px;
+    }
+  }
   &.item-selected {
     .item-check {
       display: block;

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

@@ -13,7 +13,7 @@ Object.defineProperty(exports, "CustomColumnPopup", {
 Object.defineProperty(exports, "Expression", {
   enumerable: true,
   get: function get() {
-    return _index0["default"];
+    return _index10["default"];
   }
 });
 Object.defineProperty(exports, "FormulaList", {
@@ -79,5 +79,5 @@ var _index6 = _interopRequireDefault(require("./select-join/index"));
 var _index7 = _interopRequireDefault(require("./select-table/index"));
 var _index8 = _interopRequireDefault(require("./select-permission-table/index"));
 var _index9 = _interopRequireDefault(require("./formula-list/index"));
-var _index0 = _interopRequireDefault(require("./expression/index"));
+var _index10 = _interopRequireDefault(require("./expression/index"));
 var _utils = require("./formula-list/utils");

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

@@ -109,16 +109,16 @@ var SelectColumn = function SelectColumn(_ref) {
       onOk: function () {
         var _onOk = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
           var newColumns, newMetaList;
-          return _regenerator["default"].wrap(function (_context) {
+          return _regenerator["default"].wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
                 if ((0, _utils.isValidSQLAlias)(fieldAlias)) {
-                  _context.next = 1;
+                  _context.next = 3;
                   break;
                 }
                 _pandora.Toast.warning((0, _locale.__)('SqlQueryBuilder.aliasForRules'));
                 return _context.abrupt("return", false);
-              case 1:
+              case 3:
                 newColumns = (0, _cloneDeep["default"])(columns);
                 newMetaList = store.metaList[groupIndex].list.slice();
                 newColumns[i].fieldAlias = fieldAlias;
@@ -132,7 +132,7 @@ var SelectColumn = function SelectColumn(_ref) {
                 setTimeout(function () {
                   store.setClosable(true);
                 }, 0);
-              case 2:
+              case 11:
               case "end":
                 return _context.stop();
             }

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

@@ -81,9 +81,9 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
         columns: v.columns.slice()
       });
     })),
-    _useState0 = (0, _slicedToArray2["default"])(_useState9, 2),
-    tableList = _useState0[0],
-    setTableList = _useState0[1];
+    _useState10 = (0, _slicedToArray2["default"])(_useState9, 2),
+    tableList = _useState10[0],
+    setTableList = _useState10[1];
   (0, _react.useEffect)(function () {
     setValue(_value);
     setCurColumn(_value.name);

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

@@ -20,7 +20,8 @@ var _useProvider = require("../../../hooks/use-provider");
 var _Loading = _interopRequireDefault(require("../../../common/Loading"));
 var _locale = require("../../../locale");
 var _icons = require("../../icons");
-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); }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 /**
  * 选择表弹框
  * 谁在用？
@@ -56,13 +57,13 @@ var SelectTable = function SelectTable(_ref) {
     list = _useState8[0],
     setList = _useState8[1];
   var _useState9 = (0, _react.useState)([]),
-    _useState0 = (0, _slicedToArray2["default"])(_useState9, 2),
-    originList = _useState0[0],
-    setOriginList = _useState0[1];
-  var _useState1 = (0, _react.useState)(value),
-    _useState10 = (0, _slicedToArray2["default"])(_useState1, 2),
-    val = _useState10[0],
-    setVal = _useState10[1];
+    _useState10 = (0, _slicedToArray2["default"])(_useState9, 2),
+    originList = _useState10[0],
+    setOriginList = _useState10[1];
+  var _useState11 = (0, _react.useState)(value),
+    _useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
+    val = _useState12[0],
+    setVal = _useState12[1];
   (0, _react.useEffect)(function () {
     if (value.datasourceId) {
       getTables(value.datasourceId);
@@ -74,18 +75,18 @@ var SelectTable = function SelectTable(_ref) {
   function _getTables() {
     _getTables = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(datasourceId) {
       var tables;
-      return _regenerator["default"].wrap(function (_context) {
+      return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             setLoading(true);
-            _context.next = 1;
+            _context.next = 3;
             return store.fetchDataset(datasourceId);
-          case 1:
+          case 3:
             tables = _context.sent;
             setLoading(false);
             setList(tables);
             setOriginList(tables);
-          case 2:
+          case 7:
           case "end":
             return _context.stop();
         }

package/lib/cjs/components/icons.js

@@ -176,12 +176,12 @@ var LeftJoinIcon = exports.LeftJoinIcon = function LeftJoinIcon(_ref9) {
     })
   });
 };
-var InnerJoinIcon = exports.InnerJoinIcon = function InnerJoinIcon(_ref0) {
-  var _ref0$width = _ref0.width,
-    width = _ref0$width === void 0 ? 32 : _ref0$width,
-    _ref0$height = _ref0.height,
-    height = _ref0$height === void 0 ? 32 : _ref0$height,
-    style = _ref0.style;
+var InnerJoinIcon = exports.InnerJoinIcon = function InnerJoinIcon(_ref10) {
+  var _ref10$width = _ref10.width,
+    width = _ref10$width === void 0 ? 32 : _ref10$width,
+    _ref10$height = _ref10.height,
+    height = _ref10$height === void 0 ? 32 : _ref10$height,
+    style = _ref10.style;
   return (0, _jsxRuntime.jsx)("svg", {
     viewBox: '0 0 32 32',
     width: width,
@@ -195,11 +195,11 @@ var InnerJoinIcon = exports.InnerJoinIcon = function InnerJoinIcon(_ref0) {
     })
   });
 };
-var UpArrowIcon = exports.UpArrowIcon = function UpArrowIcon(_ref1) {
-  var _ref1$width = _ref1.width,
-    width = _ref1$width === void 0 ? 16 : _ref1$width,
-    _ref1$height = _ref1.height,
-    height = _ref1$height === void 0 ? 17 : _ref1$height;
+var UpArrowIcon = exports.UpArrowIcon = function UpArrowIcon(_ref11) {
+  var _ref11$width = _ref11.width,
+    width = _ref11$width === void 0 ? 16 : _ref11$width,
+    _ref11$height = _ref11.height,
+    height = _ref11$height === void 0 ? 17 : _ref11$height;
   return (0, _jsxRuntime.jsx)("svg", {
     className: 'sort-arrow',
     viewBox: '0 0 32 34',
@@ -213,11 +213,11 @@ var UpArrowIcon = exports.UpArrowIcon = function UpArrowIcon(_ref1) {
     })
   });
 };
-var DownArrowIcon = exports.DownArrowIcon = function DownArrowIcon(_ref10) {
-  var _ref10$width = _ref10.width,
-    width = _ref10$width === void 0 ? 16 : _ref10$width,
-    _ref10$height = _ref10.height,
-    height = _ref10$height === void 0 ? 17 : _ref10$height;
+var DownArrowIcon = exports.DownArrowIcon = function DownArrowIcon(_ref12) {
+  var _ref12$width = _ref12.width,
+    width = _ref12$width === void 0 ? 16 : _ref12$width,
+    _ref12$height = _ref12.height,
+    height = _ref12$height === void 0 ? 17 : _ref12$height;
   return (0, _jsxRuntime.jsx)("svg", {
     className: 'sort-arrow',
     viewBox: '0 0 32 34',
@@ -231,11 +231,11 @@ var DownArrowIcon = exports.DownArrowIcon = function DownArrowIcon(_ref10) {
     })
   });
 };
-var CloseIcon = exports.CloseIcon = function CloseIcon(_ref11) {
-  var _ref11$width = _ref11.width,
-    width = _ref11$width === void 0 ? 16 : _ref11$width,
-    _ref11$height = _ref11.height,
-    height = _ref11$height === void 0 ? 16 : _ref11$height;
+var CloseIcon = exports.CloseIcon = function CloseIcon(_ref13) {
+  var _ref13$width = _ref13.width,
+    width = _ref13$width === void 0 ? 16 : _ref13$width,
+    _ref13$height = _ref13.height,
+    height = _ref13$height === void 0 ? 16 : _ref13$height;
   return (0, _jsxRuntime.jsx)("svg", {
     className: 'closeIcon',
     viewBox: '0 0 32 32',
@@ -249,11 +249,11 @@ var CloseIcon = exports.CloseIcon = function CloseIcon(_ref11) {
     })
   });
 };
-var AddIcon = exports.AddIcon = function AddIcon(_ref12) {
-  var _ref12$width = _ref12.width,
-    width = _ref12$width === void 0 ? 16 : _ref12$width,
-    _ref12$height = _ref12.height,
-    height = _ref12$height === void 0 ? 16 : _ref12$height;
+var AddIcon = exports.AddIcon = function AddIcon(_ref14) {
+  var _ref14$width = _ref14.width,
+    width = _ref14$width === void 0 ? 16 : _ref14$width,
+    _ref14$height = _ref14.height,
+    height = _ref14$height === void 0 ? 16 : _ref14$height;
   return (0, _jsxRuntime.jsx)("svg", {
     viewBox: '0 0 32 32',
     width: width,
@@ -266,11 +266,11 @@ var AddIcon = exports.AddIcon = function AddIcon(_ref12) {
     })
   });
 };
-var TableIcon = exports.TableIcon = function TableIcon(_ref13) {
-  var _ref13$width = _ref13.width,
-    width = _ref13$width === void 0 ? 18 : _ref13$width,
-    _ref13$height = _ref13.height,
-    height = _ref13$height === void 0 ? 18 : _ref13$height;
+var TableIcon = exports.TableIcon = function TableIcon(_ref15) {
+  var _ref15$width = _ref15.width,
+    width = _ref15$width === void 0 ? 18 : _ref15$width,
+    _ref15$height = _ref15.height,
+    height = _ref15$height === void 0 ? 18 : _ref15$height;
   return (0, _jsxRuntime.jsx)("svg", {
     viewBox: '0 0 32 32',
     width: width,
@@ -283,11 +283,11 @@ var TableIcon = exports.TableIcon = function TableIcon(_ref13) {
     })
   });
 };
-var SearchIcon = exports.SearchIcon = function SearchIcon(_ref14) {
-  var _ref14$width = _ref14.width,
-    width = _ref14$width === void 0 ? 16 : _ref14$width,
-    _ref14$height = _ref14.height,
-    height = _ref14$height === void 0 ? 16 : _ref14$height;
+var SearchIcon = exports.SearchIcon = function SearchIcon(_ref16) {
+  var _ref16$width = _ref16.width,
+    width = _ref16$width === void 0 ? 16 : _ref16$width,
+    _ref16$height = _ref16.height,
+    height = _ref16$height === void 0 ? 16 : _ref16$height;
   return (0, _jsxRuntime.jsx)("svg", {
     viewBox: '0 0 32 32',
     width: width,

package/lib/cjs/components/metabase/index.js

@@ -78,12 +78,12 @@ var Metabase = function Metabase(props) {
         content: (0, _locale.__)('metabase.validationFailed'),
         onOk: function () {
           var _onOk = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
-            return _regenerator["default"].wrap(function (_context) {
+            return _regenerator["default"].wrap(function _callee$(_context) {
               while (1) switch (_context.prev = _context.next) {
                 case 0:
-                  _context.next = 1;
+                  _context.next = 2;
                   return onSave();
-                case 1:
+                case 2:
                 case "end":
                   return _context.stop();
               }
@@ -102,7 +102,7 @@ var Metabase = function Metabase(props) {
   var onSave = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
       var intercept, _metaList;
-      return _regenerator["default"].wrap(function (_context2) {
+      return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             intercept = false; // 是否返回
@@ -116,17 +116,17 @@ var Metabase = function Metabase(props) {
               }
             });
             if (!(saveLoading || intercept)) {
-              _context2.next = 1;
+              _context2.next = 6;
               break;
             }
             return _context2.abrupt("return", null);
-          case 1:
+          case 6:
             setSaveLoading(true);
-            _context2.next = 2;
+            _context2.next = 9;
             return onOk === null || onOk === void 0 ? void 0 : onOk(_metaList);
-          case 2:
+          case 9:
             setSaveLoading(false);
-          case 3:
+          case 10:
           case "end":
             return _context2.stop();
         }