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

package/dist/externalVersion.js

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

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

@@ -1,3 +1,4 @@
+import { Collection } from '@tachybase/database';
 import { WhereOptions } from 'sequelize';
 import { handleFieldParams } from '../types';
 type NestedRecord<T, K extends string> = K extends `${infer Head}.${infer Tail}` ? {
@@ -16,10 +17,10 @@ export declare class FieldBase {
     number(params: handleFieldParams): WhereOptions<any>;
     json(params: handleFieldParams): any;
     protected convertToObj<T, K extends string>(key: K, value: T): NestedRecord<T, K>;
-    getMultiSelectFilter(field: string, matchEnum: string[]): WhereOptions<any>;
+    getMultiSelectFilter(rawField: 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;
+    protected getCollectionField(fieldName: string, collection: Collection, collectionName?: string): import("sequelize/lib/utils").Col;
+    protected getCollectionFieldColName(fieldName: string, collection: Collection, 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, collectionName } = params;
+    const { field, keyword, collectionName, collection } = params;
     if (isNaN(Number(keyword))) {
       return null;
     }
     return {
       [import_database.Op.and]: [
         (0, import_database.where)(
-          (0, import_database.literal)(`CAST(${this.getCollectionFieldColName(field, collectionName)} AS TEXT)`),
+          (0, import_database.literal)(`CAST(${this.getCollectionFieldColName(field, collection, collectionName)} AS TEXT)`),
           // 确保不加引号，直接插入 SQL 表达式
           {
             [import_database.Op.like]: `%${(0, import_utils.escapeLike)(keyword)}%`
@@ -85,19 +85,19 @@ class FieldBase {
     return { [newKey]: this.convertToObj(parts.join("."), value) };
   }
   // 多选框如何生成filter
-  getMultiSelectFilter(field, matchEnum) {
-    return this.convertToObj(field, { [import_database.Op.contains]: matchEnum });
+  getMultiSelectFilter(rawField, matchEnum) {
+    return this.convertToObj(rawField, { [import_database.Op.contains]: matchEnum });
   }
   array(params) {
     var _a, _b;
-    const { field, keyword, fields, collectionName } = params;
+    const { field, keyword, fields, collectionName, collection } = 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(this.getCollectionFieldColName(field, collectionName), matchEnum);
+      return this.getMultiSelectFilter(this.getCollectionFieldColName(field, collection, collectionName), matchEnum);
     }
     return null;
   }
@@ -112,14 +112,19 @@ class FieldBase {
     }
     return matchEnum;
   }
-  getCollectionField(fieldName, collectionName) {
+  getCollectionField(fieldName, collection, collectionName) {
+    var _a;
+    let rawFieldName = fieldName;
+    if (collection) {
+      rawFieldName = ((_a = collection.model.rawAttributes[fieldName]) == null ? void 0 : _a.field) || fieldName;
+    }
     if (!collectionName) {
-      return (0, import_sequelize.col)(fieldName);
+      return (0, import_sequelize.col)(rawFieldName);
     }
-    return (0, import_sequelize.col)(`${collectionName}.${fieldName}`);
+    return (0, import_sequelize.col)(`${collectionName}.${rawFieldName}`);
   }
-  getCollectionFieldColName(fieldName, collectionName) {
-    return this.getCollectionField(fieldName, collectionName).col;
+  getCollectionFieldColName(fieldName, collection, collectionName) {
+    return this.getCollectionField(fieldName, collection, collectionName).col;
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -7,5 +7,5 @@ export declare class FieldMariadb extends FieldBase {
     number(params: handleFieldParams): WhereOptions<any>;
     date(params: handleFieldParams): WhereOptions<any>;
     json(params: handleFieldParams): WhereOptions<any>;
-    getMultiSelectFilter(field: string, matchEnum: string[]): WhereOptions<any>;
+    getMultiSelectFilter(rawField: string, matchEnum: string[]): WhereOptions<any>;
 }

package/dist/server/dialects/FieldMariadb.js

@@ -45,11 +45,11 @@ class FieldMariadb extends import_FieldBase.FieldBase {
     return formatStr;
   }
   number(params) {
-    const { field, keyword, collectionName } = params;
+    const { field, keyword, collectionName, collection } = params;
     return {
       [import_database.Op.and]: [
         (0, import_database.where)(
-          (0, import_database.literal)(`CAST(${this.getCollectionFieldColName(field, collectionName)} AS CHAR)`),
+          (0, import_database.literal)(`CAST(${this.getCollectionFieldColName(field, collection, collectionName)} AS CHAR)`),
           // 确保不加引号，直接插入 SQL 表达式
           {
             [import_database.Op.like]: `%${(0, import_utils.escapeLike)(keyword)}%`
@@ -59,13 +59,13 @@ class FieldMariadb extends import_FieldBase.FieldBase {
     };
   }
   date(params) {
-    const { field, keyword, dateStr, timezone, collectionName } = params;
+    const { field, keyword, dateStr, timezone, collectionName, collection } = params;
     return {
       [import_database.Op.and]: [
         (0, import_database.where)(
           (0, import_database.fn)(
             "DATE_FORMAT",
-            (0, import_database.fn)("CONVERT_TZ", this.getCollectionField(field, collectionName), "+00:00", timezone),
+            (0, import_database.fn)("CONVERT_TZ", this.getCollectionField(field, collection, collectionName), "+00:00", timezone),
             dateStr
           ),
           {
@@ -76,18 +76,23 @@ class FieldMariadb extends import_FieldBase.FieldBase {
     };
   }
   json(params) {
-    const { field, keyword, collectionName } = params;
+    const { field, keyword, collection, collectionName } = params;
     return {
       [import_database.Op.and]: [
-        (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)}%`
-        })
+        (0, import_database.where)(
+          (0, import_database.literal)(
+            `JSON_UNQUOTE(JSON_EXTRACT(${this.getCollectionFieldColName(field, collection, collectionName)}, '$'))`
+          ),
+          {
+            [import_database.Op.like]: `%${(0, import_utils.escapeLike)(keyword)}%`
+          }
+        )
       ]
     };
   }
-  getMultiSelectFilter(field, matchEnum) {
+  getMultiSelectFilter(rawField, matchEnum) {
     return {
-      [import_database.Op.and]: [(0, import_database.literal)(`JSON_CONTAINS(${this.getCollectionFieldColName(field)}, '${JSON.stringify(matchEnum)}')`)]
+      [import_database.Op.and]: [(0, import_database.literal)(`JSON_CONTAINS(${rawField}, '${JSON.stringify(matchEnum)}')`)]
     };
   }
 }

package/dist/server/dialects/FieldPostgres.js

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

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

@@ -11,5 +11,5 @@ export declare class FieldSqlite extends FieldBase {
     json(params: handleFieldParams): {
         [Op.and]: any[];
     };
-    getMultiSelectFilter(field: string, matchEnum: string[]): WhereOptions<any>;
+    getMultiSelectFilter(rawField: string, matchEnum: string[]): WhereOptions<any>;
 }

package/dist/server/dialects/FieldSqlite.js

@@ -45,14 +45,14 @@ class FieldSqlite extends import_FieldBase.FieldBase {
     return formatStr;
   }
   date(params) {
-    const { field, keyword, dateStr, timezone, collectionName } = params;
+    const { field, keyword, dateStr, timezone, collectionName, collection } = params;
     return {
       [import_database.Op.and]: [
         (0, import_database.where)(
           (0, import_database.fn)(
             "strftime",
             dateStr,
-            (0, import_database.fn)("datetime", this.getCollectionField(field, collectionName), (0, import_utils.convertTimezoneOffset)(timezone))
+            (0, import_database.fn)("datetime", this.getCollectionField(field, collection, collectionName), (0, import_utils.convertTimezoneOffset)(timezone))
           ),
           {
             [this.like]: `%${(0, import_utils.escapeLike)(keyword)}%`
@@ -62,23 +62,23 @@ class FieldSqlite extends import_FieldBase.FieldBase {
     };
   }
   json(params) {
-    const { field, keyword, collectionName } = params;
+    const { field, keyword, collectionName, collection } = params;
     return {
       [import_database.Op.and]: [
-        (0, import_database.where)((0, import_database.literal)(`json_extract(${this.getCollectionFieldColName(field, collectionName)}, '$')`), {
+        (0, import_database.where)((0, import_database.literal)(`json_extract(${this.getCollectionFieldColName(field, collection, collectionName)}, '$')`), {
           [this.like]: `%${(0, import_utils.escapeLike)(keyword)}%`
         })
       ]
     };
   }
-  getMultiSelectFilter(field, matchEnum) {
+  getMultiSelectFilter(rawField, matchEnum) {
     const matchList = matchEnum.map((value) => `'${value}'`).join(",");
     return {
       [import_database.Op.and]: [
         (0, import_database.literal)(`
         EXISTS (
           SELECT 1
-          FROM json_each(${this.getCollectionFieldColName(field)})
+          FROM json_each(${rawField})
           WHERE json_each.value IN (${matchList})
         )
       `)

package/dist/server/searchField.d.ts

@@ -1,8 +1,10 @@
+import { Collection } from '@tachybase/database';
 import { FieldBase } from './dialects/FieldBase';
 import { ProcessFieldParams } from './types';
 export declare function handleField(handler: FieldBase, func: Function, field: string, fields: Map<string, any>, keywords: string[], extraParams?: {
     timezone?: string;
     dateStr?: string;
     collectionName?: string;
+    collection?: Collection;
 }): any[];
 export declare function processField({ field, handler, collection, ctx, search, timezone }: ProcessFieldParams): any[];

package/dist/server/searchField.js

@@ -58,7 +58,8 @@ function handleField(handler, func, field, fields, keywords, extraParams = {}) {
       keyword,
       timezone: extraParams.timezone,
       dateStr: extraParams.dateStr,
-      collectionName: extraParams.collectionName
+      collectionName: extraParams.collectionName,
+      collection: extraParams.collection
     };
     const condition = func.call(handler, params);
     if (condition) {
@@ -83,11 +84,12 @@ function processField({ field, handler, collection, ctx, search, timezone }) {
     return [];
   }
   if (isFieldType(type, "string")) {
-    return handleField(handler, handler.string, field, fields, search.keywords);
+    return handleField(handler, handler.string, field, fields, search.keywords, { collection });
   } else if (isFieldType(type, "number")) {
     if (!field.includes(".")) {
       return handleField(handler, handler.number, field, fields, search.keywords, {
-        collectionName: collection.name
+        collectionName: collection.name,
+        collection
       });
     }
   } else if (isFieldType(type, "date")) {
@@ -96,16 +98,17 @@ function processField({ field, handler, collection, ctx, search, timezone }) {
       return handleField(handler, handler.date, field, fields, search.keywords, {
         timezone,
         dateStr,
-        collectionName: collection.name
+        collectionName: collection.name,
+        collection
       });
     }
   } else if (isFieldType(type, "json")) {
     if (!field.includes(".")) {
-      return handleField(handler, handler.json, field, fields, search.keywords);
+      return handleField(handler, handler.json, field, fields, search.keywords, { collection });
     }
   } else if (isFieldType(type, "array")) {
     if (!field.includes(".")) {
-      return handleField(handler, handler.array, field, fields, search.keywords);
+      return handleField(handler, handler.array, field, fields, search.keywords, { collection });
     }
   }
   return [];

package/dist/server/types.d.ts

@@ -22,4 +22,5 @@ export type handleFieldParams = {
     fields: Map<string, any>;
     timezone?: string;
     dateStr?: string;
+    collection?: Collection;
 };

package/package.json

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