@gingkoo/pandora-metabase 1.0.19 → 1.0.21

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

@@ -24,6 +24,7 @@ var _selectList = _interopRequireDefault(require("../select-list"));
 var _selectColumnMultiple = _interopRequireDefault(require("../select-column-multiple"));
 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); }
 /**
  * 关联模块 选择表字段
@@ -74,7 +75,7 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
     _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
     condition = _useState4[0],
     setCondition = _useState4[1];
-  var _useState5 = (0, _react.useState)(value.rhs || []),
+  var _useState5 = (0, _react.useState)((0, _cloneDeep["default"])(value.rhs || [])),
     _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
     rhsVal = _useState6[0],
     setRhsVal = _useState6[1];

package/lib/cjs/components/modules/custom-column.js

@@ -122,6 +122,9 @@ var CustomColumn = function CustomColumn(props) {
       var _prevGroupBy$group, _prevGroupBy$by;
       var _data = {
         table: prevGroupBy.alias,
+        name: prevGroupBy.alias,
+        name_zh: prevGroupBy.alias,
+        id: prevGroupBy.alias,
         tableId: prevGroupBy.alias,
         tableUuid: prevGroupBy.tableUuid || (0, _helper.uuidv4)('table'),
         alias: prevGroupBy.alias,
@@ -167,7 +170,7 @@ var CustomColumn = function CustomColumn(props) {
         data = data.concat(
         // @ts-ignore
         joinData.map(function (v) {
-          return {
+          return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v.table2), {}, {
             alias: v.table2.alias,
             table: v.table2.name,
             tableId: v.table2.id,
@@ -175,14 +178,14 @@ var CustomColumn = function CustomColumn(props) {
             columns: v.columns,
             datasourceId: mainTable.table.datasourceId,
             datasourceName: mainTable.table.datasourceName
-          };
+          });
         }));
       }
     } else {
       // @ts-ignore
       data = store.metaList[groupIndex].list.slice(0, index).map(function (v) {
         if (v.type === _enum.TypeEnum.data) {
-          return {
+          return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v.table), {}, {
             alias: v.table.alias,
             table: v.table.name,
             tableId: v.table.id,
@@ -190,9 +193,9 @@ var CustomColumn = function CustomColumn(props) {
             columns: v.columns,
             datasourceId: mainTable.table.datasourceId,
             datasourceName: mainTable.table.datasourceName
-          };
+          });
         } else if (v.type === _enum.TypeEnum.joinData) {
-          return {
+          return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v.table2), {}, {
             alias: v.table2.alias,
             table: v.table2.name,
             tableId: v.table2.id,
@@ -200,7 +203,7 @@ var CustomColumn = function CustomColumn(props) {
             columns: v.columns,
             datasourceId: mainTable.table.datasourceId,
             datasourceName: mainTable.table.datasourceName
-          };
+          });
         } else {
           return {
             table: null

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

@@ -86,6 +86,7 @@ var JoinData = function JoinData(props) {
       ExistAboveGroupBy = _getHelper.ExistAboveGroupBy,
       prevList = _getHelper.prevList,
       prevGroupBy = _getHelper.prevGroupBy;
+    // 获取左侧表
     if (ExistAboveGroupBy) {
       var _prevGroupBy$group, _prevGroupBy$by;
       var _data = {
@@ -147,7 +148,7 @@ var JoinData = function JoinData(props) {
     } else {
       data = store.metaList[groupIndex].list.slice(0, index + 1).reduce(function (mo, v) {
         if (v.type === _enum.TypeEnum.data) {
-          mo.push({
+          mo.push((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v.table), {}, {
             alias: v.table.alias,
             name: v.table.name,
             name_zh: v.table.name_zh,
@@ -156,7 +157,7 @@ var JoinData = function JoinData(props) {
             columns: v.columns,
             datasourceId: v.table.datasourceId,
             datasourceName: v.table.datasourceName
-          });
+          }));
         } else if (v.type === _enum.TypeEnum.joinData) {
           mo.push({
             alias: v.table2.alias,
@@ -170,9 +171,12 @@ var JoinData = function JoinData(props) {
           });
         }
         return mo;
-      }, []);
+      }, []).filter(function (v) {
+        return v.tableUuid === meta.table1.tableUuid;
+      });
     }
-    // 添加当前表
+    // 获取右侧表
+    // 添加table2
     data = data.concat([{
       alias: meta.table2.alias,
       name: meta.table2.name,
@@ -389,71 +393,77 @@ var JoinData = function JoinData(props) {
       })
     });
   }
+  // 切换表后重置数据
   function initExpressions() {
-    var _newMeta$index, _newMeta$index2;
+    console.log(11);
     var newMeta = store.metaList[groupIndex].list.slice();
-    if (newMeta[index].table1.name && newMeta[index].table2.name && !((_newMeta$index = newMeta[index]) !== null && _newMeta$index !== void 0 && _newMeta$index.expressions) || ((_newMeta$index2 = newMeta[index]) === null || _newMeta$index2 === void 0 || (_newMeta$index2 = _newMeta$index2.expressions) === null || _newMeta$index2 === void 0 ? void 0 : _newMeta$index2.length) < 1) {
-      newMeta[index].expressions = [{
-        lhs: [{
-          fieldName: '',
-          // 字段名
-          fieldNameZh: '',
-          // 字段中文名
-          fieldAlias: '',
-          // 别名
-          fieldUuid: '',
-          // uuid
-          fieldId: '',
-          // 字段id
-          // quotes?: string; // 字段展示的 不知道有没有用
-          tableName: '',
-          // 表名
-          tableNameZh: '',
-          tableId: '',
-          // 表名
-          tableAlias: '',
-          // 别名
-          tableUuid: '',
-          // 表唯一标识
-          datasourceName: '',
-          // 数据源名
-          datasourceId: '',
-          // 数据源id
-          type: _types.AtomsTypeEnum.FIELD
-        }],
-        condition: '',
-        rhs: [{
-          fieldName: '',
-          // 字段名
-          fieldNameZh: '',
-          // 字段中文名
-          fieldAlias: '',
-          // 别名
-          fieldUuid: '',
-          // uuid
-          fieldId: '',
-          // 字段id
-          // quotes?: string; // 字段展示的 不知道有没有用
-          tableName: '',
-          // 表名
-          tableNameZh: '',
-          tableId: '',
-          // 表名
-          tableAlias: '',
-          // 别名
-          tableUuid: '',
-          // 表唯一标识
-          datasourceName: '',
-          // 数据源名
-          datasourceId: '',
-          // 数据源id
-          type: _types.AtomsTypeEnum.FIELD
-        }],
-        // quotes: '',
-        type: _types.AtomsTypeEnum.JOIN_DEFAULT
-      }];
-      store.setMeta(newMeta, groupIndex);
-    }
+    newMeta[index].expressions = [{
+      lhs: [{
+        fieldName: '',
+        // 字段名
+        fieldNameZh: '',
+        // 字段中文名
+        fieldAlias: '',
+        // 别名
+        fieldUuid: '',
+        // uuid
+        fieldId: '',
+        // 字段id
+        // quotes?: string; // 字段展示的 不知道有没有用
+        tableName: '',
+        // 表名
+        tableNameZh: '',
+        tableId: '',
+        // 表名
+        tableAlias: '',
+        // 别名
+        tableUuid: '',
+        // 表唯一标识
+        datasourceName: '',
+        // 数据源名
+        datasourceId: '',
+        // 数据源id
+        type: _types.AtomsTypeEnum.FIELD
+      }],
+      condition: '',
+      rhs: [{
+        fieldName: '',
+        // 字段名
+        fieldNameZh: '',
+        // 字段中文名
+        fieldAlias: '',
+        // 别名
+        fieldUuid: '',
+        // uuid
+        fieldId: '',
+        // 字段id
+        // quotes?: string; // 字段展示的 不知道有没有用
+        tableName: '',
+        // 表名
+        tableNameZh: '',
+        tableId: '',
+        // 表名
+        tableAlias: '',
+        // 别名
+        tableUuid: '',
+        // 表唯一标识
+        datasourceName: '',
+        // 数据源名
+        datasourceId: '',
+        // 数据源id
+        type: _types.AtomsTypeEnum.FIELD
+      }],
+      // quotes: '',
+      type: _types.AtomsTypeEnum.JOIN_DEFAULT
+    }];
+    store.setMeta(newMeta, groupIndex);
+    // if (
+    //   ((newMeta[index] as MetaJoin).table1.name &&
+    //     (newMeta[index] as MetaJoin).table2.name &&
+    //     !(newMeta[index] as MetaJoin)?.expressions) ||
+    //   (newMeta[index] as MetaJoin)?.expressions?.length < 1
+    // ) {
+    // }
   }
   function selectJoin(e) {
     var newMeta = store.metaList[groupIndex].list.slice();

package/lib/cjs/hooks/patch.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.sortPatch = exports.joinDataPatch = exports.filterPatch = exports.dataPatch = exports.customColumnPatch = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _helper = require("../utils/helper");
+var _utils = require("../utils");
 var _types = require("../store/types");
 var _enum = require("../store/enum");
 var dataPatch = exports.dataPatch = function dataPatch(newMeta) {
@@ -27,6 +28,15 @@ var joinDataPatch = exports.joinDataPatch = function joinDataPatch(newMeta) {
     if ((item.type === _types.AtomsTypeEnum.EXPRESSION || item.type === _types.AtomsTypeEnum.JOIN_DEFAULT) && item.lhs) {
       return newMeta;
     }
+    if (item.type === _types.AtomsTypeEnum.EXISTS && !item.tableUuid) {
+      return newMeta;
+    }
+    if (item.type === _types.AtomsTypeEnum.NOT_EXISTS && !item.tableUuid) {
+      return newMeta;
+    }
+    if (item.type === _types.AtomsTypeEnum.FIELD && item.fieldName) {
+      return newMeta;
+    }
   }
   // if (
   //   newMeta.expressions?.[0]?.type &&
@@ -262,6 +272,9 @@ var filterPatch = exports.filterPatch = function filterPatch(newMeta) {
     if (item.type === _types.AtomsTypeEnum.NOT_EXISTS && !item.tableUuid) {
       return newMeta;
     }
+    if (item.type === _types.AtomsTypeEnum.FIELD && item.fieldName) {
+      return newMeta;
+    }
   }
   var _filter = (_newMeta$filter2 = newMeta.filter) === null || _newMeta$filter2 === void 0 ? void 0 : _newMeta$filter2.map(function (v) {
     // 表达式
@@ -335,15 +348,17 @@ var filterPatch = exports.filterPatch = function filterPatch(newMeta) {
       };
       return tem;
     } else if (v.type === 'notExists') {
+      var notExists = renderExists(v.notExists);
       return {
-        notExists: renderExists(v.notExists),
-        quotes: v.quotes,
+        notExists: notExists,
+        quotes: (0, _utils.buildSqlQuery)(notExists, v.type),
         type: _types.AtomsTypeEnum.NOT_EXISTS
       };
     } else if (v.type === 'exists') {
+      var _notExists = renderExists(v.notExists);
       return {
-        notExists: renderExists(v.notExists),
-        quotes: v.quotes,
+        notExists: _notExists,
+        quotes: (0, _utils.buildSqlQuery)(_notExists, v.type),
         type: _types.AtomsTypeEnum.EXISTS
       };
     }
@@ -353,14 +368,23 @@ var filterPatch = exports.filterPatch = function filterPatch(newMeta) {
   return newMeta;
 };
 var customColumnPatch = exports.customColumnPatch = function customColumnPatch(newMeta) {
-  var _newMeta$customColumn;
+  var _newMeta$customColumn, _newMeta$customColumn2;
   var item = ((_newMeta$customColumn = newMeta.customColumn[0].formulaList) === null || _newMeta$customColumn === void 0 ? void 0 : _newMeta$customColumn[0]) || {};
-  if (item.type && Object.values(_types.AtomsTypeEnum).includes(item.type || '')) {
+  if (item !== null && item !== void 0 && item.type && Object.values(_types.AtomsTypeEnum).includes(item.type)) {
     if (item.type === _types.AtomsTypeEnum.EXPRESSION && item.lhs) {
       return newMeta;
     }
+    if (item.type === _types.AtomsTypeEnum.EXISTS && !item.tableUuid) {
+      return newMeta;
+    }
+    if (item.type === _types.AtomsTypeEnum.NOT_EXISTS && !item.tableUuid) {
+      return newMeta;
+    }
+    if (item.type === _types.AtomsTypeEnum.FIELD && item.fieldName) {
+      return newMeta;
+    }
   }
-  newMeta.customColumn = newMeta.customColumn.map(function (v) {
+  newMeta.customColumn = (newMeta === null || newMeta === void 0 || (_newMeta$customColumn2 = newMeta.customColumn) === null || _newMeta$customColumn2 === void 0 ? void 0 : _newMeta$customColumn2.map(function (v) {
     var _formulaList = v.formulaList.map(function (formula) {
       var tem = formula;
       if (formula.type === 'expression') {
@@ -473,7 +497,7 @@ var customColumnPatch = exports.customColumnPatch = function customColumnPatch(n
     return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
       formulaList: _formulaList
     });
-  });
+  })) || newMeta.customColumn;
   return newMeta;
 };
 var sortPatch = exports.sortPatch = function sortPatch(newMeta) {
@@ -483,6 +507,15 @@ var sortPatch = exports.sortPatch = function sortPatch(newMeta) {
     if (item.type === _types.AtomsTypeEnum.EXPRESSION && item.lhs) {
       return newMeta;
     }
+    if (item.type === _types.AtomsTypeEnum.EXISTS && !item.tableUuid) {
+      return newMeta;
+    }
+    if (item.type === _types.AtomsTypeEnum.NOT_EXISTS && !item.tableUuid) {
+      return newMeta;
+    }
+    if (item.type === _types.AtomsTypeEnum.FIELD && item.fieldName) {
+      return newMeta;
+    }
   }
   var _sort = (_newMeta$sort2 = newMeta.sort) === null || _newMeta$sort2 === void 0 ? void 0 : _newMeta$sort2.map(function (v) {
     return {

package/lib/cjs/utils.js

@@ -532,7 +532,7 @@ var buildSqlQuery = exports.buildSqlQuery = function buildSqlQuery() {
   var tables = [];
   var joins = [];
   var wheres = [];
-  data.forEach(function (item) {
+  data === null || data === void 0 || data.forEach(function (item) {
     if (item.type === _enum.TypeEnum.data) {
       var meta = item;
       var tableName = "".concat(meta.table.name);
@@ -606,7 +606,7 @@ var buildSqlQuery = exports.buildSqlQuery = function buildSqlQuery() {
       sqlClauses.push(joins.join(' '));
     }
     if (wheres.length > 0) {
-      sqlClauses.push("WHERE ".concat(wheres.join(' AND ')));
+      sqlClauses.push("WHERE ".concat(wheres.join(' ')));
     }
   }
   sqlClauses.push(')');

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

@@ -20,6 +20,7 @@ import SelectList from '../select-list';
 import SelectColumnMultiple from '../select-column-multiple';
 import { LeftArrowIcon } from '../../icons';
 import { useStore } from '../../../hooks/use-provider';
+import cloneDeep from 'lodash/cloneDeep';
 var RangePicker = DatePicker.RangePicker;
 var NUMBER_LIST = ['等于', '不等于', '大于', '小于', '介于之间', '大于或等于', '小于或等于', '为空', '不为空', '以...开始', '以...结束', '不以...开始', '不以...结束', 'In', 'Not In', '正则匹配'];
 var STRING_LIST = ['等于', '不等于', '包含', '不包含', '为空', '不为空', '以...开始', '以...结束', '不以...开始', '不以...结束', 'In', 'Not In', '正则匹配'];
@@ -65,7 +66,7 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     condition = _useState4[0],
     setCondition = _useState4[1];
-  var _useState5 = useState(value.rhs || []),
+  var _useState5 = useState(cloneDeep(value.rhs || [])),
     _useState6 = _slicedToArray(_useState5, 2),
     rhsVal = _useState6[0],
     setRhsVal = _useState6[1];

package/lib/es/components/modules/custom-column.js

@@ -118,6 +118,9 @@ var CustomColumn = function CustomColumn(props) {
       var _prevGroupBy$group, _prevGroupBy$by;
       var _data = {
         table: prevGroupBy.alias,
+        name: prevGroupBy.alias,
+        name_zh: prevGroupBy.alias,
+        id: prevGroupBy.alias,
         tableId: prevGroupBy.alias,
         tableUuid: prevGroupBy.tableUuid || uuidv4('table'),
         alias: prevGroupBy.alias,
@@ -163,7 +166,7 @@ var CustomColumn = function CustomColumn(props) {
         data = data.concat(
         // @ts-ignore
         joinData.map(function (v) {
-          return {
+          return _objectSpread(_objectSpread({}, v.table2), {}, {
             alias: v.table2.alias,
             table: v.table2.name,
             tableId: v.table2.id,
@@ -171,14 +174,14 @@ var CustomColumn = function CustomColumn(props) {
             columns: v.columns,
             datasourceId: mainTable.table.datasourceId,
             datasourceName: mainTable.table.datasourceName
-          };
+          });
         }));
       }
     } else {
       // @ts-ignore
       data = store.metaList[groupIndex].list.slice(0, index).map(function (v) {
         if (v.type === TypeEnum.data) {
-          return {
+          return _objectSpread(_objectSpread({}, v.table), {}, {
             alias: v.table.alias,
             table: v.table.name,
             tableId: v.table.id,
@@ -186,9 +189,9 @@ var CustomColumn = function CustomColumn(props) {
             columns: v.columns,
             datasourceId: mainTable.table.datasourceId,
             datasourceName: mainTable.table.datasourceName
-          };
+          });
         } else if (v.type === TypeEnum.joinData) {
-          return {
+          return _objectSpread(_objectSpread({}, v.table2), {}, {
             alias: v.table2.alias,
             table: v.table2.name,
             tableId: v.table2.id,
@@ -196,7 +199,7 @@ var CustomColumn = function CustomColumn(props) {
             columns: v.columns,
             datasourceId: mainTable.table.datasourceId,
             datasourceName: mainTable.table.datasourceName
-          };
+          });
         } else {
           return {
             table: null

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

@@ -80,6 +80,7 @@ var JoinData = function JoinData(props) {
       ExistAboveGroupBy = _getHelper.ExistAboveGroupBy,
       prevList = _getHelper.prevList,
       prevGroupBy = _getHelper.prevGroupBy;
+    // 获取左侧表
     if (ExistAboveGroupBy) {
       var _prevGroupBy$group, _prevGroupBy$by;
       var _data = {
@@ -141,7 +142,7 @@ var JoinData = function JoinData(props) {
     } else {
       data = store.metaList[groupIndex].list.slice(0, index + 1).reduce(function (mo, v) {
         if (v.type === TypeEnum.data) {
-          mo.push({
+          mo.push(_objectSpread(_objectSpread({}, v.table), {}, {
             alias: v.table.alias,
             name: v.table.name,
             name_zh: v.table.name_zh,
@@ -150,7 +151,7 @@ var JoinData = function JoinData(props) {
             columns: v.columns,
             datasourceId: v.table.datasourceId,
             datasourceName: v.table.datasourceName
-          });
+          }));
         } else if (v.type === TypeEnum.joinData) {
           mo.push({
             alias: v.table2.alias,
@@ -164,9 +165,12 @@ var JoinData = function JoinData(props) {
           });
         }
         return mo;
-      }, []);
+      }, []).filter(function (v) {
+        return v.tableUuid === meta.table1.tableUuid;
+      });
     }
-    // 添加当前表
+    // 获取右侧表
+    // 添加table2
     data = data.concat([{
       alias: meta.table2.alias,
       name: meta.table2.name,
@@ -383,71 +387,77 @@ var JoinData = function JoinData(props) {
       })
     });
   }
+  // 切换表后重置数据
   function initExpressions() {
-    var _newMeta$index, _newMeta$index2;
+    console.log(11);
     var newMeta = store.metaList[groupIndex].list.slice();
-    if (newMeta[index].table1.name && newMeta[index].table2.name && !((_newMeta$index = newMeta[index]) !== null && _newMeta$index !== void 0 && _newMeta$index.expressions) || ((_newMeta$index2 = newMeta[index]) === null || _newMeta$index2 === void 0 || (_newMeta$index2 = _newMeta$index2.expressions) === null || _newMeta$index2 === void 0 ? void 0 : _newMeta$index2.length) < 1) {
-      newMeta[index].expressions = [{
-        lhs: [{
-          fieldName: '',
-          // 字段名
-          fieldNameZh: '',
-          // 字段中文名
-          fieldAlias: '',
-          // 别名
-          fieldUuid: '',
-          // uuid
-          fieldId: '',
-          // 字段id
-          // quotes?: string; // 字段展示的 不知道有没有用
-          tableName: '',
-          // 表名
-          tableNameZh: '',
-          tableId: '',
-          // 表名
-          tableAlias: '',
-          // 别名
-          tableUuid: '',
-          // 表唯一标识
-          datasourceName: '',
-          // 数据源名
-          datasourceId: '',
-          // 数据源id
-          type: AtomsTypeEnum.FIELD
-        }],
-        condition: '',
-        rhs: [{
-          fieldName: '',
-          // 字段名
-          fieldNameZh: '',
-          // 字段中文名
-          fieldAlias: '',
-          // 别名
-          fieldUuid: '',
-          // uuid
-          fieldId: '',
-          // 字段id
-          // quotes?: string; // 字段展示的 不知道有没有用
-          tableName: '',
-          // 表名
-          tableNameZh: '',
-          tableId: '',
-          // 表名
-          tableAlias: '',
-          // 别名
-          tableUuid: '',
-          // 表唯一标识
-          datasourceName: '',
-          // 数据源名
-          datasourceId: '',
-          // 数据源id
-          type: AtomsTypeEnum.FIELD
-        }],
-        // quotes: '',
-        type: AtomsTypeEnum.JOIN_DEFAULT
-      }];
-      store.setMeta(newMeta, groupIndex);
-    }
+    newMeta[index].expressions = [{
+      lhs: [{
+        fieldName: '',
+        // 字段名
+        fieldNameZh: '',
+        // 字段中文名
+        fieldAlias: '',
+        // 别名
+        fieldUuid: '',
+        // uuid
+        fieldId: '',
+        // 字段id
+        // quotes?: string; // 字段展示的 不知道有没有用
+        tableName: '',
+        // 表名
+        tableNameZh: '',
+        tableId: '',
+        // 表名
+        tableAlias: '',
+        // 别名
+        tableUuid: '',
+        // 表唯一标识
+        datasourceName: '',
+        // 数据源名
+        datasourceId: '',
+        // 数据源id
+        type: AtomsTypeEnum.FIELD
+      }],
+      condition: '',
+      rhs: [{
+        fieldName: '',
+        // 字段名
+        fieldNameZh: '',
+        // 字段中文名
+        fieldAlias: '',
+        // 别名
+        fieldUuid: '',
+        // uuid
+        fieldId: '',
+        // 字段id
+        // quotes?: string; // 字段展示的 不知道有没有用
+        tableName: '',
+        // 表名
+        tableNameZh: '',
+        tableId: '',
+        // 表名
+        tableAlias: '',
+        // 别名
+        tableUuid: '',
+        // 表唯一标识
+        datasourceName: '',
+        // 数据源名
+        datasourceId: '',
+        // 数据源id
+        type: AtomsTypeEnum.FIELD
+      }],
+      // quotes: '',
+      type: AtomsTypeEnum.JOIN_DEFAULT
+    }];
+    store.setMeta(newMeta, groupIndex);
+    // if (
+    //   ((newMeta[index] as MetaJoin).table1.name &&
+    //     (newMeta[index] as MetaJoin).table2.name &&
+    //     !(newMeta[index] as MetaJoin)?.expressions) ||
+    //   (newMeta[index] as MetaJoin)?.expressions?.length < 1
+    // ) {
+    // }
   }
   function selectJoin(e) {
     var newMeta = store.metaList[groupIndex].list.slice();

package/lib/es/hooks/patch.js

@@ -1,5 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { uuidv4 } from '../utils/helper';
+import { buildSqlQuery } from '../utils';
 import { AtomsTypeEnum } from '../store/types';
 import { TypeEnum } from '../store/enum';
 export var dataPatch = function dataPatch(newMeta) {
@@ -20,6 +21,15 @@ export var joinDataPatch = function joinDataPatch(newMeta) {
     if ((item.type === AtomsTypeEnum.EXPRESSION || item.type === AtomsTypeEnum.JOIN_DEFAULT) && item.lhs) {
       return newMeta;
     }
+    if (item.type === AtomsTypeEnum.EXISTS && !item.tableUuid) {
+      return newMeta;
+    }
+    if (item.type === AtomsTypeEnum.NOT_EXISTS && !item.tableUuid) {
+      return newMeta;
+    }
+    if (item.type === AtomsTypeEnum.FIELD && item.fieldName) {
+      return newMeta;
+    }
   }
   // if (
   //   newMeta.expressions?.[0]?.type &&
@@ -255,6 +265,9 @@ export var filterPatch = function filterPatch(newMeta) {
     if (item.type === AtomsTypeEnum.NOT_EXISTS && !item.tableUuid) {
       return newMeta;
     }
+    if (item.type === AtomsTypeEnum.FIELD && item.fieldName) {
+      return newMeta;
+    }
   }
   var _filter = (_newMeta$filter2 = newMeta.filter) === null || _newMeta$filter2 === void 0 ? void 0 : _newMeta$filter2.map(function (v) {
     // 表达式
@@ -328,15 +341,17 @@ export var filterPatch = function filterPatch(newMeta) {
       };
       return tem;
     } else if (v.type === 'notExists') {
+      var notExists = renderExists(v.notExists);
       return {
-        notExists: renderExists(v.notExists),
-        quotes: v.quotes,
+        notExists: notExists,
+        quotes: buildSqlQuery(notExists, v.type),
         type: AtomsTypeEnum.NOT_EXISTS
       };
     } else if (v.type === 'exists') {
+      var _notExists = renderExists(v.notExists);
       return {
-        notExists: renderExists(v.notExists),
-        quotes: v.quotes,
+        notExists: _notExists,
+        quotes: buildSqlQuery(_notExists, v.type),
         type: AtomsTypeEnum.EXISTS
       };
     }
@@ -346,14 +361,23 @@ export var filterPatch = function filterPatch(newMeta) {
   return newMeta;
 };
 export var customColumnPatch = function customColumnPatch(newMeta) {
-  var _newMeta$customColumn;
+  var _newMeta$customColumn, _newMeta$customColumn2;
   var item = ((_newMeta$customColumn = newMeta.customColumn[0].formulaList) === null || _newMeta$customColumn === void 0 ? void 0 : _newMeta$customColumn[0]) || {};
-  if (item.type && Object.values(AtomsTypeEnum).includes(item.type || '')) {
+  if (item !== null && item !== void 0 && item.type && Object.values(AtomsTypeEnum).includes(item.type)) {
     if (item.type === AtomsTypeEnum.EXPRESSION && item.lhs) {
       return newMeta;
     }
+    if (item.type === AtomsTypeEnum.EXISTS && !item.tableUuid) {
+      return newMeta;
+    }
+    if (item.type === AtomsTypeEnum.NOT_EXISTS && !item.tableUuid) {
+      return newMeta;
+    }
+    if (item.type === AtomsTypeEnum.FIELD && item.fieldName) {
+      return newMeta;
+    }
   }
-  newMeta.customColumn = newMeta.customColumn.map(function (v) {
+  newMeta.customColumn = (newMeta === null || newMeta === void 0 || (_newMeta$customColumn2 = newMeta.customColumn) === null || _newMeta$customColumn2 === void 0 ? void 0 : _newMeta$customColumn2.map(function (v) {
     var _formulaList = v.formulaList.map(function (formula) {
       var tem = formula;
       if (formula.type === 'expression') {
@@ -466,7 +490,7 @@ export var customColumnPatch = function customColumnPatch(newMeta) {
     return _objectSpread(_objectSpread({}, v), {}, {
       formulaList: _formulaList
     });
-  });
+  })) || newMeta.customColumn;
   return newMeta;
 };
 export var sortPatch = function sortPatch(newMeta) {
@@ -476,6 +500,15 @@ export var sortPatch = function sortPatch(newMeta) {
     if (item.type === AtomsTypeEnum.EXPRESSION && item.lhs) {
       return newMeta;
     }
+    if (item.type === AtomsTypeEnum.EXISTS && !item.tableUuid) {
+      return newMeta;
+    }
+    if (item.type === AtomsTypeEnum.NOT_EXISTS && !item.tableUuid) {
+      return newMeta;
+    }
+    if (item.type === AtomsTypeEnum.FIELD && item.fieldName) {
+      return newMeta;
+    }
   }
   var _sort = (_newMeta$sort2 = newMeta.sort) === null || _newMeta$sort2 === void 0 ? void 0 : _newMeta$sort2.map(function (v) {
     return {

package/lib/es/utils.js

@@ -523,7 +523,7 @@ export var buildSqlQuery = function buildSqlQuery() {
   var tables = [];
   var joins = [];
   var wheres = [];
-  data.forEach(function (item) {
+  data === null || data === void 0 || data.forEach(function (item) {
     if (item.type === TypeEnum.data) {
       var meta = item;
       var tableName = "".concat(meta.table.name);
@@ -597,7 +597,7 @@ export var buildSqlQuery = function buildSqlQuery() {
       sqlClauses.push(joins.join(' '));
     }
     if (wheres.length > 0) {
-      sqlClauses.push("WHERE ".concat(wheres.join(' AND ')));
+      sqlClauses.push("WHERE ".concat(wheres.join(' ')));
     }
   }
   sqlClauses.push(')');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gingkoo/pandora-metabase",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "description": "",
   "main": "lib/es/index.js",
   "module": "lib/es/index.js",