Oak-Team
/
oak-domain
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 33 Wiki Activity

笔误

This commit is contained in:
Xu Chang 2022-02-28 11:27:38 +08:00
parent f8ff3dab9a
commit 61c81dd104
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/schema/filter.js
View File

@ -1,11 +1,14 @@
"use strict";
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.addFilterSegment = void 0;
const console_1 = require("console");
const assert_1 = __importDefault(require("assert"));
const lodash_1 = require("lodash");
function addFilterSegment(segment, filter2) {
const filter = filter2 ? (0, lodash_1.cloneDeep)(filter2) : {};
(0, console_1.assert)(segment);
(0, assert_1.default)(segment);
if ((0, lodash_1.intersection)((0, lodash_1.keys)(filter), (0, lodash_1.keys)(segment)).length > 0) {
if (filter.hasOwnProperty('$and')) {
filter.$and.push(segment);

2
src/schema/filter.ts
View File

@ -1,4 +1,4 @@
import { assert } from "console";
import assert from 'assert';
import { assign, cloneDeep, intersection, keys } from "lodash";
import { DeduceFilter, EntityDef, EntityShape } from "../types/Entity";
import { TriggerEntityShape } from "../types/Trigger";