@gingkoo/pandora-metabase 1.0.95 → 1.0.96

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

@@ -25,6 +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"));
+var _utils = require("../formula-list/utils");
+var _itemName = _interopRequireDefault(require("../../modules/components/item-name"));
 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); }
 /**
  * 关联模块 选择表字段
@@ -603,19 +605,20 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
   var selectConstant = function selectConstant(e) {
     store.setClosable(false);
     var node = e.currentTarget;
-    var _type = Number(node.getAttribute('v-type'));
+    var _val = node.getAttribute('v-val');
     store.setPopup2({
       visible: true,
       node: e.currentTarget,
       container: container,
       content: (0, _jsxRuntime.jsx)(_selectList["default"], {
-        value: _type,
+        value: _val,
         list: store.constantList || [],
         onChange: function onChange(val) {
           closePopup2();
           // let curObj = store.constantList.filter((v: any) => v.value === val)[0];
           var newVal = rhsVal.slice();
-          newVal[0].val = val;
+          newVal[0].id = val;
+          newVal[0].val = (0, _utils.getConstantLabel)(store.constantList, val);
           setRhsVal(newVal);
           store.setClosable(true);
         }
@@ -875,13 +878,17 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
             }, i);
           }
           if (v.type === _types.AtomsTypeEnum.CONSTANT) {
-            return (0, _jsxRuntime.jsx)("div", {
-              className: (0, _classnames["default"])("Sqb-TableName purple-name", {
-                notSelected: !v.val
-              }),
-              "v-type": v.type,
-              onClick: selectConstant,
-              children: v.val ? "".concat(v.val) : (0, _locale.__)('SqlQueryBuilder.pickConstant')
+            return (0, _jsxRuntime.jsx)(_itemName["default"], {
+              isError: !!(v.id || v.val) && !(0, _utils.getConstantLabel)(store.constantList, v.id || v.val),
+              message: "\u5E38\u91CF\u4E22\u5931",
+              children: (0, _jsxRuntime.jsx)("div", {
+                className: (0, _classnames["default"])("Sqb-TableName purple-name", {
+                  notSelected: !v.val
+                }),
+                "v-val": v.id || v.val,
+                onClick: selectConstant,
+                children: (0, _utils.getConstantLabel)(store.constantList, v.id || v.val, v.val) || (0, _locale.__)('SqlQueryBuilder.pickConstant')
+              }, i)
             }, i);
           }
           if (v.type === _types.AtomsTypeEnum.INPUT_STRING || v.type === _types.AtomsTypeEnum.INPUT_STRING_LIST) {

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

@@ -87,5 +87,8 @@ var getQuotes = exports.getQuotes = function getQuotes(fun, _args, formulaList)
 };
 var formulaIsError = exports.formulaIsError = function formulaIsError(fun, formulaList) {
   var obj = fun.id ? formulaList[fun.id] : formulaList[fun.name];
+  if (!fun.name && !fun.quotes) {
+    return false;
+  }
   return !(obj !== null && obj !== void 0 && obj.name);
 };

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

@@ -757,7 +757,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     } else if (type === _types.AtomsTypeEnum.CONSTANT) {
       //常量
       return (0, _jsxRuntime.jsx)(_itemName["default"], {
-        isError: (v.id || v.val) && !(0, _utils3.getConstantLabel)(store.constantList, v.id || v.val),
+        isError: !!(v.id || v.val) && !(0, _utils3.getConstantLabel)(store.constantList, v.id || v.val),
         message: "\u5E38\u91CF\u4E22\u5931",
         children: (0, _jsxRuntime.jsxs)("div", {
           className: (0, _classnames["default"])("Sqb-TableName", {

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

@@ -107,7 +107,7 @@ var Metabase = function Metabase(props) {
           case 0:
             intercept = false; // 是否返回
             _metaList = (0, _utils.splitByUnion)(store.metaList);
-            _metaList[0].patchVersion = '1.0.0';
+            _metaList[0].patchVersion = '1.1.0';
             store.metaList.map(function (v) {
               var _v$list;
               if (v.type !== 'union' && !((_v$list = v.list) === null || _v$list === void 0 ? void 0 : _v$list[0]).table.name) {

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

@@ -20,8 +20,9 @@ var _index = _interopRequireDefault(require("../../index"));
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 var _helper = require("../../utils/helper");
+var _utils = require("../dialog/formula-list/utils");
 var _locale = require("../../locale");
-var _utils = require("../../utils");
+var _utils2 = require("../../utils");
 var _enum = require("../../store/enum");
 var _types = require("../../store/types");
 var _helper2 = require("../../store/helper");
@@ -76,12 +77,12 @@ var JoinData = function JoinData(props) {
   var store = (0, _useProvider.useStore)();
   var filterCustomType = store.filterCustomType;
   var metaKey = meta.metaKey;
-  var index = (0, _utils.findIndex)(store.metaList[groupIndex].list, meta);
+  var index = (0, _utils2.findIndex)(store.metaList[groupIndex].list, meta);
   var table1Selected = Boolean(meta.table1.name);
   var table2Selected = Boolean(meta.table2.name);
   var subQuerySelected = Boolean((_meta$subquery = meta.subquery) === null || _meta$subquery === void 0 || (_meta$subquery = _meta$subquery[0]) === null || _meta$subquery === void 0 || (_meta$subquery = _meta$subquery.table) === null || _meta$subquery === void 0 ? void 0 : _meta$subquery.name);
   var columnsSelected = meta.table1.name && meta.table2.name;
-  var _getHelper = (0, _utils.getHelper)(store.metaList[groupIndex].list, meta),
+  var _getHelper = (0, _utils2.getHelper)(store.metaList[groupIndex].list, meta),
     prevTables = _getHelper.prevTables,
     prevGroupBy = _getHelper.prevGroupBy;
   var _useState = (0, _react.useState)(false),
@@ -139,7 +140,7 @@ var JoinData = function JoinData(props) {
   // 获取表格列
   var getTableColumns = function getTableColumns() {
     var data = [];
-    var _getHelper2 = (0, _utils.getHelper)(store.metaList[groupIndex].list, meta),
+    var _getHelper2 = (0, _utils2.getHelper)(store.metaList[groupIndex].list, meta),
       ExistAboveGroupBy = _getHelper2.ExistAboveGroupBy,
       prevList = _getHelper2.prevList,
       prevGroupBy = _getHelper2.prevGroupBy;
@@ -253,7 +254,7 @@ var JoinData = function JoinData(props) {
   };
   var getCollectionTableColumns = function getCollectionTableColumns() {
     var data = [];
-    var _getHelper3 = (0, _utils.getHelper)(store.metaList[groupIndex].list, meta),
+    var _getHelper3 = (0, _utils2.getHelper)(store.metaList[groupIndex].list, meta),
       ExistAboveGroupBy = _getHelper3.ExistAboveGroupBy,
       prevList = _getHelper3.prevList,
       prevGroupBy = _getHelper3.prevGroupBy;
@@ -395,10 +396,10 @@ var JoinData = function JoinData(props) {
     var node = e.currentTarget;
     // let type: ExpressionsEnum = node.getAttribute('v-data');
     var _ind = Number(node.getAttribute('v-index'));
-    var index = (0, _utils.findIndex)(store.metaList[groupIndex].list, meta);
+    var index = (0, _utils2.findIndex)(store.metaList[groupIndex].list, meta);
     var table_type = FlagLocation.TABLE_1;
     var data = [];
-    var _getHelper4 = (0, _utils.getHelper)(store.metaList[groupIndex].list, meta),
+    var _getHelper4 = (0, _utils2.getHelper)(store.metaList[groupIndex].list, meta),
       ExistAboveGroupBy = _getHelper4.ExistAboveGroupBy,
       prevList = _getHelper4.prevList,
       prevGroupBy = _getHelper4.prevGroupBy;
@@ -686,7 +687,7 @@ var JoinData = function JoinData(props) {
   }
   function getColumns(_position) {
     var data = [];
-    var _getHelper5 = (0, _utils.getHelper)(store.metaList[groupIndex].list, meta),
+    var _getHelper5 = (0, _utils2.getHelper)(store.metaList[groupIndex].list, meta),
       ExistAboveGroupBy = _getHelper5.ExistAboveGroupBy,
       prevList = _getHelper5.prevList,
       prevGroupBy = _getHelper5.prevGroupBy;
@@ -804,9 +805,9 @@ var JoinData = function JoinData(props) {
     var _position = node.getAttribute('v-position');
     var _ind = Number(node.getAttribute('v-index'));
     var _ind2 = Number(node.getAttribute('v-index2'));
-    var index = (0, _utils.findIndex)(store.metaList[groupIndex].list, meta);
+    var index = (0, _utils2.findIndex)(store.metaList[groupIndex].list, meta);
     var data = [];
-    var _getHelper6 = (0, _utils.getHelper)(store.metaList[groupIndex].list, meta),
+    var _getHelper6 = (0, _utils2.getHelper)(store.metaList[groupIndex].list, meta),
       ExistAboveGroupBy = _getHelper6.ExistAboveGroupBy,
       prevList = _getHelper6.prevList,
       prevGroupBy = _getHelper6.prevGroupBy;
@@ -987,9 +988,11 @@ var JoinData = function JoinData(props) {
           var curObj = store.constantList.filter(function (v) {
             return v.value === val;
           })[0];
-          var index = (0, _utils.findIndex)(store.metaList[groupIndex].list, meta);
+          var index = (0, _utils2.findIndex)(store.metaList[groupIndex].list, meta);
           var newMeta = store.metaList[groupIndex].list.slice();
           newMeta[index].expressions[_ind][_position][_ind2].val = curObj.value;
+          newMeta[index].expressions[_ind][_position][_ind2].id = curObj.value;
+          newMeta[index].expressions[_ind][_position][_ind2].val = (0, _utils.getConstantLabel)(store.constantList, curObj.value);
           store.setMeta(newMeta, groupIndex, {
             obj: val,
             type: _types.ChangeType[_position]
@@ -1008,7 +1011,7 @@ var JoinData = function JoinData(props) {
     var _ref2$position = _ref2.position,
       position = _ref2$position === void 0 ? 'rhs' : _ref2$position,
       _ind = _ref2.index;
-    var index = (0, _utils.findIndex)(store.metaList[groupIndex].list, meta);
+    var index = (0, _utils2.findIndex)(store.metaList[groupIndex].list, meta);
     var newMeta = store.metaList[groupIndex].list.slice();
     store.setPopup({
       visible: true,
@@ -1085,7 +1088,7 @@ var JoinData = function JoinData(props) {
       _ref3$index2 = _ref3.index2,
       index2 = _ref3$index2 === void 0 ? 0 : _ref3$index2;
     // : 'rhs'
-    var index = (0, _utils.findIndex)(store.metaList[groupIndex].list, meta);
+    var index = (0, _utils2.findIndex)(store.metaList[groupIndex].list, meta);
     var newMeta = store.metaList[groupIndex].list.slice();
     newMeta[index].expressions[index1][position][index2].val = val;
     store.setMeta(newMeta, groupIndex);
@@ -1100,7 +1103,7 @@ var JoinData = function JoinData(props) {
       toolbar = _store$preProps2.toolbar,
       other = (0, _objectWithoutProperties2["default"])(_store$preProps2, _excluded);
     var newMeta = (0, _cloneDeep["default"])(store.metaList[groupIndex].list);
-    var index = (0, _utils.findIndex)(store.metaList[groupIndex].list, meta);
+    var index = (0, _utils2.findIndex)(store.metaList[groupIndex].list, meta);
     var oldList = (0, _cloneDeep["default"])(newMeta[index].subquery);
     var _toolbar = subToolbar || toolbar;
     // _toolbar = _toolbar.filter((v: string) => v !== 'group'); // 子查询不需要分组
@@ -1126,7 +1129,7 @@ var JoinData = function JoinData(props) {
                 alias: newMeta[index].table2.alias || (0, _helper.getAlias)(newList[0].table.name, newMeta, ((_store$preProps3 = store.preProps) === null || _store$preProps3 === void 0 ? void 0 : _store$preProps3.notExistsColumns) || [])
                 // fields: [],
               });
-              var items = (0, _utils.getSubColumns)(newList);
+              var items = (0, _utils2.getSubColumns)(newList);
               var newColumns = items.flatMap(function (item) {
                 return item.columns;
               }).map(function (v) {
@@ -1169,7 +1172,7 @@ var JoinData = function JoinData(props) {
   };
   // 切换子查询
   var switchSubQuery = function switchSubQuery() {
-    var index = (0, _utils.findIndex)(store.metaList[groupIndex].list, meta);
+    var index = (0, _utils2.findIndex)(store.metaList[groupIndex].list, meta);
     var newMeta = store.metaList[groupIndex].list.slice();
     newMeta[index].isSubquery = !newMeta[index].isSubquery;
     // (newMeta[index] as MetaJoin).table2 = {
@@ -1204,17 +1207,17 @@ var JoinData = function JoinData(props) {
           return _regenerator["default"].wrap(function (_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
-                if ((0, _utils.isValidSQLAlias)(alias)) {
+                if ((0, _utils2.isValidSQLAlias)(alias)) {
                   _context2.next = 1;
                   break;
                 }
                 _pandora.Toast.warning((0, _locale.__)('SqlQueryBuilder.aliasForRules'));
                 return _context2.abrupt("return", false);
               case 1:
-                index = (0, _utils.findIndex)(store.metaList[groupIndex].list, meta);
+                index = (0, _utils2.findIndex)(store.metaList[groupIndex].list, meta);
                 newMeta = store.metaList[groupIndex].list.slice();
                 newMeta[index].table2.alias = alias;
-                newMeta = (0, _utils.changeTableAlias)(newMeta, newMeta[index].table2);
+                newMeta = (0, _utils2.changeTableAlias)(newMeta, newMeta[index].table2);
                 store.setMeta(newMeta, groupIndex, {
                   obj: newMeta[index].table2,
                   type: _types.ChangeType.tableAlias
@@ -1235,14 +1238,14 @@ var JoinData = function JoinData(props) {
   };
   // 修改连接符
   var changeOperator = function changeOperator(key, i) {
-    var index = (0, _utils.findIndex)(store.metaList[groupIndex].list, meta);
+    var index = (0, _utils2.findIndex)(store.metaList[groupIndex].list, meta);
     var newMeta = store.metaList[groupIndex].list.slice();
     newMeta[index].expressions[i].val = key;
     store.setMeta(newMeta, groupIndex);
   };
   var changeExpression = function changeExpression(e, i) {
     var data = getTableColumns();
-    var index = (0, _utils.findIndex)(store.metaList[groupIndex].list, meta);
+    var index = (0, _utils2.findIndex)(store.metaList[groupIndex].list, meta);
     var newMeta = store.metaList[groupIndex].list.slice();
     var value = newMeta[index].expressions[i];
     store.setPopup({
@@ -1266,7 +1269,7 @@ var JoinData = function JoinData(props) {
   // 添加表达式
   var addExpression = function addExpression(type) {
     var i = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : -1;
-    var index = (0, _utils.findIndex)(store.metaList[groupIndex].list, meta);
+    var index = (0, _utils2.findIndex)(store.metaList[groupIndex].list, meta);
     var newMeta = store.metaList[groupIndex].list.slice();
     var item = (0, _dialog.getTemplateItem)(type);
     if (type === _types.AtomsTypeEnum.JOIN_DEFAULT) {
@@ -1373,7 +1376,7 @@ var JoinData = function JoinData(props) {
     if ((items === null || items === void 0 || (_items$ = items[0]) === null || _items$ === void 0 ? void 0 : _items$.type) === _types.AtomsTypeEnum.FIELD) {
       var _items$2, _items$3;
       return (0, _jsxRuntime.jsx)(_itemName["default"], {
-        isError: (0, _utils.isError)(items, getColumns(type)),
+        isError: (0, _utils2.isError)(items, getColumns(type)),
         children: (0, _jsxRuntime.jsx)("div", {
           className: (0, _classnames["default"])("Sqb-TableName", {
             notSelected: !((_items$2 = items[0]) !== null && _items$2 !== void 0 && _items$2.fieldName)
@@ -1428,16 +1431,20 @@ var JoinData = function JoinData(props) {
           }, index);
         }
         if (item.type === _types.AtomsTypeEnum.CONSTANT) {
-          return (0, _jsxRuntime.jsx)("div", {
-            className: (0, _classnames["default"])("Sqb-TableName", {
-              notSelected: !item.val
-            }),
-            "v-position": type,
-            "v-index": i,
-            "v-index2": index,
-            "v-val": item.val,
-            onClick: selectConstant,
-            children: item.val ? item.val : (0, _locale.__)('SqlQueryBuilder.pickConstant')
+          return (0, _jsxRuntime.jsx)(_itemName["default"], {
+            isError: !!(item.id || item.val) && !(0, _utils.getConstantLabel)(store.constantList, item.id || item.val),
+            message: "\u5E38\u91CF\u4E22\u5931",
+            children: (0, _jsxRuntime.jsx)("div", {
+              className: (0, _classnames["default"])("Sqb-TableName", {
+                notSelected: !item.val
+              }),
+              "v-position": type,
+              "v-index": i,
+              "v-index2": index,
+              "v-val": item.id || item.val,
+              onClick: selectConstant,
+              children: (0, _utils.getConstantLabel)(store.constantList, item.id || item.val, item.val) || (0, _locale.__)('SqlQueryBuilder.pickConstant')
+            }, index)
           }, index);
         }
       });
@@ -1724,7 +1731,7 @@ var JoinData = function JoinData(props) {
                       className: 'mr-2 operator-icon',
                       icon: (0, _jsxRuntime.jsx)(_pandoraIcons.FfLine, {}),
                       onClick: function onClick() {
-                        var index = (0, _utils.findIndex)(store.metaList[groupIndex].list, meta);
+                        var index = (0, _utils2.findIndex)(store.metaList[groupIndex].list, meta);
                         var newMeta = store.metaList[groupIndex].list.slice();
                         newMeta[index].expressions.splice(i, 1);
                         store.setMeta(newMeta, groupIndex);
@@ -1774,7 +1781,7 @@ var JoinData = function JoinData(props) {
                       className: 'mr-2 operator-icon',
                       icon: (0, _jsxRuntime.jsx)(_pandoraIcons.FfLine, {}),
                       onClick: function onClick() {
-                        var index = (0, _utils.findIndex)(store.metaList[groupIndex].list, meta);
+                        var index = (0, _utils2.findIndex)(store.metaList[groupIndex].list, meta);
                         var newMeta = store.metaList[groupIndex].list.slice();
                         newMeta[index].expressions.splice(i, 1);
                         store.setMeta(newMeta, groupIndex);
@@ -1790,7 +1797,7 @@ var JoinData = function JoinData(props) {
                     className: 'ml-2 mr-4 text-gray-500',
                     children: "on"
                   }), (0, _jsxRuntime.jsx)(_itemName["default"], {
-                    isError: (0, _utils.isError)(v, getTableColumns()),
+                    isError: (0, _utils2.isError)(v, getTableColumns()),
                     children: (0, _jsxRuntime.jsx)("div", {
                       className: (0, _classnames["default"])("Sqb-TableName purple-name", {
                         notSelected: !v.quotes
@@ -1824,7 +1831,7 @@ var JoinData = function JoinData(props) {
                       className: 'mr-2 operator-icon',
                       icon: (0, _jsxRuntime.jsx)(_pandoraIcons.FfLine, {}),
                       onClick: function onClick() {
-                        var index = (0, _utils.findIndex)(store.metaList[groupIndex].list, meta);
+                        var index = (0, _utils2.findIndex)(store.metaList[groupIndex].list, meta);
                         var newMeta = store.metaList[groupIndex].list.slice();
                         newMeta[index].expressions.splice(i, 1);
                         store.setMeta(newMeta, groupIndex);
@@ -1879,7 +1886,7 @@ var JoinData = function JoinData(props) {
                       className: 'mr-2 operator-icon',
                       icon: (0, _jsxRuntime.jsx)(_pandoraIcons.FfLine, {}),
                       onClick: function onClick() {
-                        var index = (0, _utils.findIndex)(store.metaList[groupIndex].list, meta);
+                        var index = (0, _utils2.findIndex)(store.metaList[groupIndex].list, meta);
                         var newMeta = store.metaList[groupIndex].list.slice();
                         newMeta[index].expressions.splice(i, 1);
                         store.setMeta(newMeta, groupIndex);

package/lib/cjs/hooks/patch.d.ts

@@ -1,7 +1,5 @@
 import { MetaListType } from '../store/types';
-export declare const dataPatch: (newMeta: any) => any;
-export declare const joinDataPatch: (newMeta: any) => any;
-export declare const filterPatch: (newMeta: any) => any;
-export declare const customColumnPatch: (newMeta: any) => any;
-export declare const sortPatch: (newMeta: any) => any;
-export declare const patchMetas: (items: MetaListType[]) => MetaListType[];
+export declare const joinDataPatch: (newMeta: any, constantList: any, formulaTemplates: any) => any;
+export declare const filterPatch: (newMeta: any, constantList: any, formulaTemplates: any) => any;
+export declare const customColumnPatch: (newMeta: any, constantList: any, formulaTemplates: any) => any;
+export declare const patchMetas: (items: MetaListType[], constantList: any[], formulaTemplates: any[]) => MetaListType[];