@tachybase/plugin-full-text-search 1.3.9 → 1.3.10

package/dist/externalVersion.js

@@ -1,9 +1,9 @@
 module.exports = {
-  "@tachybase/client": "1.3.9",
+  "@tachybase/client": "1.3.10",
   "antd": "5.22.5",
   "lodash": "4.17.21",
-  "@tachybase/server": "1.3.9",
-  "@tachybase/database": "1.3.9",
-  "@tachybase/actions": "1.3.9",
+  "@tachybase/server": "1.3.10",
+  "@tachybase/database": "1.3.10",
+  "@tachybase/actions": "1.3.10",
   "sequelize": "6.37.5"
 };

package/dist/server/dialects/FieldBase.d.ts

@@ -19,5 +19,7 @@ export declare class FieldBase {
     getMultiSelectFilter(field: string, matchEnum: string[]): WhereOptions<any>;
     array(params: handleFieldParams): WhereOptions<any>;
     private getMatchEnum;
+    protected getCollectionField(fieldName: string, collectionName?: string): import("sequelize/lib/utils").Col;
+    protected getCollectionFieldColName(fieldName: string, collectionName?: string): string;
 }
 export {};

package/dist/server/dialects/FieldBase.js

@@ -49,14 +49,14 @@ class FieldBase {
     return this.convertToObj(field, { [this.like]: `%${(0, import_utils.escapeLike)(keyword)}%` });
   }
   number(params) {
-    const { field, keyword } = params;
+    const { field, keyword, collectionName } = params;
     if (isNaN(Number(keyword))) {
       return null;
     }
     return {
       [import_database.Op.and]: [
         (0, import_database.where)(
-          (0, import_database.literal)(`CAST(${(0, import_sequelize.col)(field).col} AS TEXT)`),
+          (0, import_database.literal)(`CAST(${this.getCollectionFieldColName(field, collectionName)} AS TEXT)`),
           // 确保不加引号，直接插入 SQL 表达式
           {
             [import_database.Op.like]: `%${(0, import_utils.escapeLike)(keyword)}%`
@@ -90,14 +90,14 @@ class FieldBase {
   }
   array(params) {
     var _a, _b;
-    const { field, keyword, fields } = params;
+    const { field, keyword, fields, collectionName } = params;
     const fieldInfo = fields.get(field);
     if (((_b = (_a = fieldInfo == null ? void 0 : fieldInfo.options) == null ? void 0 : _a.uiSchema) == null ? void 0 : _b["x-component"]) === "Select") {
       const matchEnum = this.getMatchEnum(fieldInfo, keyword);
       if (!matchEnum.length) {
         return null;
       }
-      return this.getMultiSelectFilter(field, matchEnum);
+      return this.getMultiSelectFilter(this.getCollectionFieldColName(field, collectionName), matchEnum);
     }
     return null;
   }
@@ -112,6 +112,15 @@ class FieldBase {
     }
     return matchEnum;
   }
+  getCollectionField(fieldName, collectionName) {
+    if (!collectionName) {
+      return (0, import_sequelize.col)(fieldName);
+    }
+    return (0, import_sequelize.col)(`${collectionName}.${fieldName}`);
+  }
+  getCollectionFieldColName(fieldName, collectionName) {
+    return this.getCollectionField(fieldName, collectionName).col;
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/server/dialects/FieldMariadb.js

@@ -21,7 +21,6 @@ __export(FieldMariadb_exports, {
 });
 module.exports = __toCommonJS(FieldMariadb_exports);
 var import_database = require("@tachybase/database");
-var import_sequelize = require("sequelize");
 var import_utils = require("../utils");
 var import_FieldBase = require("./FieldBase");
 class FieldMariadb extends import_FieldBase.FieldBase {
@@ -46,11 +45,11 @@ class FieldMariadb extends import_FieldBase.FieldBase {
     return formatStr;
   }
   number(params) {
-    const { field, keyword } = params;
+    const { field, keyword, collectionName } = params;
     return {
       [import_database.Op.and]: [
         (0, import_database.where)(
-          (0, import_database.literal)(`CAST(${(0, import_sequelize.col)(field).col} AS CHAR)`),
+          (0, import_database.literal)(`CAST(${this.getCollectionFieldColName(field, collectionName)} AS CHAR)`),
           // 确保不加引号，直接插入 SQL 表达式
           {
             [import_database.Op.like]: `%${(0, import_utils.escapeLike)(keyword)}%`
@@ -60,20 +59,27 @@ class FieldMariadb extends import_FieldBase.FieldBase {
     };
   }
   date(params) {
-    const { field, keyword, dateStr, timezone } = params;
+    const { field, keyword, dateStr, timezone, collectionName } = params;
     return {
       [import_database.Op.and]: [
-        (0, import_database.where)((0, import_database.fn)("DATE_FORMAT", (0, import_database.fn)("CONVERT_TZ", (0, import_sequelize.col)(field), "+00:00", timezone), dateStr), {
-          [this.like]: `%${(0, import_utils.escapeLike)(keyword)}%`
-        })
+        (0, import_database.where)(
+          (0, import_database.fn)(
+            "DATE_FORMAT",
+            (0, import_database.fn)("CONVERT_TZ", this.getCollectionField(field, collectionName), "+00:00", timezone),
+            dateStr
+          ),
+          {
+            [this.like]: `%${(0, import_utils.escapeLike)(keyword)}%`
+          }
+        )
       ]
     };
   }
   json(params) {
-    const { field, keyword } = params;
+    const { field, keyword, collectionName } = params;
     return {
       [import_database.Op.and]: [
-        (0, import_database.where)((0, import_database.literal)(`JSON_UNQUOTE(JSON_EXTRACT(${field}, '$'))`), {
+        (0, import_database.where)((0, import_database.literal)(`JSON_UNQUOTE(JSON_EXTRACT(${this.getCollectionFieldColName(field, collectionName)}, '$'))`), {
           [import_database.Op.like]: `%${(0, import_utils.escapeLike)(keyword)}%`
         })
       ]
@@ -81,7 +87,7 @@ class FieldMariadb extends import_FieldBase.FieldBase {
   }
   getMultiSelectFilter(field, matchEnum) {
     return {
-      [import_database.Op.and]: [(0, import_database.literal)(`JSON_CONTAINS(${(0, import_sequelize.col)(field).col}, '${JSON.stringify(matchEnum)}')`)]
+      [import_database.Op.and]: [(0, import_database.literal)(`JSON_CONTAINS(${this.getCollectionFieldColName(field)}, '${JSON.stringify(matchEnum)}')`)]
     };
   }
 }

package/dist/server/dialects/FieldPostgres.js

@@ -54,7 +54,7 @@ class FieldPostgres extends import_FieldBase.FieldBase {
               "TIMEZONE",
               timezone,
               // 参数1：目标时区
-              (0, import_database.fn)("TIMEZONE", "UTC", (0, import_sequelize.col)(`"${collectionName}"."${field}"`))
+              (0, import_database.fn)("TIMEZONE", "UTC", this.getCollectionField(field, collectionName))
               // 参数2：UTC 转换后的字段
             ),
             dateStr
@@ -83,7 +83,7 @@ class FieldPostgres extends import_FieldBase.FieldBase {
     return {
       [import_database.Op.and]: [
         (0, import_database.where)(
-          (0, import_sequelize.literal)(`CAST("${collectionName}"."${field}" AS TEXT)`),
+          (0, import_sequelize.literal)(`CAST(${this.getCollectionFieldColName(field, collectionName)} AS TEXT)`),
           // 确保不加引号，直接插入 SQL 表达式
           {
             [import_database.Op.like]: `%${(0, import_utils.escapeLike)(keyword)}%`

package/dist/server/dialects/FieldSqlite.js

@@ -21,7 +21,6 @@ __export(FieldSqlite_exports, {
 });
 module.exports = __toCommonJS(FieldSqlite_exports);
 var import_database = require("@tachybase/database");
-var import_sequelize = require("sequelize");
 var import_utils = require("../utils");
 var import_FieldBase = require("./FieldBase");
 class FieldSqlite extends import_FieldBase.FieldBase {
@@ -46,20 +45,27 @@ class FieldSqlite extends import_FieldBase.FieldBase {
     return formatStr;
   }
   date(params) {
-    const { field, keyword, dateStr, timezone } = params;
+    const { field, keyword, dateStr, timezone, collectionName } = params;
     return {
       [import_database.Op.and]: [
-        (0, import_database.where)((0, import_database.fn)("strftime", dateStr, (0, import_database.fn)("datetime", (0, import_sequelize.col)(field), (0, import_utils.convertTimezoneOffset)(timezone))), {
-          [this.like]: `%${(0, import_utils.escapeLike)(keyword)}%`
-        })
+        (0, import_database.where)(
+          (0, import_database.fn)(
+            "strftime",
+            dateStr,
+            (0, import_database.fn)("datetime", this.getCollectionField(field, collectionName), (0, import_utils.convertTimezoneOffset)(timezone))
+          ),
+          {
+            [this.like]: `%${(0, import_utils.escapeLike)(keyword)}%`
+          }
+        )
       ]
     };
   }
   json(params) {
-    const { field, keyword } = params;
+    const { field, keyword, collectionName } = params;
     return {
       [import_database.Op.and]: [
-        (0, import_database.where)((0, import_database.literal)(`json_extract(${field}, '$')`), {
+        (0, import_database.where)((0, import_database.literal)(`json_extract(${this.getCollectionFieldColName(field, collectionName)}, '$')`), {
           [this.like]: `%${(0, import_utils.escapeLike)(keyword)}%`
         })
       ]
@@ -72,7 +78,7 @@ class FieldSqlite extends import_FieldBase.FieldBase {
         (0, import_database.literal)(`
         EXISTS (
           SELECT 1
-          FROM json_each(${(0, import_sequelize.col)(field).col})
+          FROM json_each(${this.getCollectionFieldColName(field)})
           WHERE json_each.value IN (${matchList})
         )
       `)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tachybase/plugin-full-text-search",
   "displayName": "Full-text Search",
-  "version": "1.3.9",
+  "version": "1.3.10",
   "description": "Provides full text search capability",
   "keywords": [
     "System management"
@@ -14,11 +14,11 @@
     "sequelize": "^6.37.5"
   },
   "peerDependencies": {
-    "@tachybase/actions": "1.3.9",
-    "@tachybase/server": "1.3.9",
-    "@tachybase/test": "1.3.9",
-    "@tachybase/client": "1.3.9",
-    "@tachybase/database": "1.3.9"
+    "@tachybase/actions": "1.3.10",
+    "@tachybase/client": "1.3.10",
+    "@tachybase/database": "1.3.10",
+    "@tachybase/test": "1.3.10",
+    "@tachybase/server": "1.3.10"
   },
   "description.zh-CN": "提供全字段搜索能力",
   "displayName.zh-CN": "全文搜索"