@tachybase/plugin-full-text-search 0.23.48 → 1.0.6

package/dist/externalVersion.js

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

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 } = params;
+    const { field, keyword, dateStr, timezone, collectionName } = 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", (0, import_sequelize.col)(field))
+              (0, import_database.fn)("TIMEZONE", "UTC", (0, import_sequelize.col)(`"${collectionName}"."${field}"`))
               // 参数2：UTC 转换后的字段
             ),
             dateStr
@@ -76,14 +76,14 @@ class FieldPostgres extends import_FieldBase.FieldBase {
     });
   }
   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_sequelize.literal)(`CAST("${field}" AS TEXT)`),
+          (0, import_sequelize.literal)(`CAST("${collectionName}"."${field}" AS TEXT)`),
           // 确保不加引号，直接插入 SQL 表达式
           {
             [import_database.Op.like]: `%${(0, import_utils.escapeLike)(keyword)}%`

package/dist/server/searchField.d.ts

@@ -3,5 +3,6 @@ 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;
 }): any[];
 export declare function processField({ field, handler, collection, ctx, search, timezone }: ProcessFieldParams): any[];

package/dist/server/searchField.js

@@ -22,8 +22,8 @@ __export(searchField_exports, {
 });
 module.exports = __toCommonJS(searchField_exports);
 const fieldTypes = {
-  string: ["string", "text", "sequence", "uid", "integer", "float"],
-  number: ["bigInt", "double"],
+  string: ["string", "text", "sequence", "uid"],
+  number: ["bigInt", "double", "integer", "float"],
   date: ["date", "datetime", "timestamp"],
   json: ["json", "jsonb"],
   array: ["array"]
@@ -57,7 +57,8 @@ function handleField(handler, func, field, fields, keywords, extraParams = {}) {
       fields,
       keyword,
       timezone: extraParams.timezone,
-      dateStr: extraParams.dateStr
+      dateStr: extraParams.dateStr,
+      collectionName: extraParams.collectionName
     };
     const condition = func.call(handler, params);
     if (condition) {
@@ -85,14 +86,17 @@ function processField({ field, handler, collection, ctx, search, timezone }) {
     return handleField(handler, handler.string, field, fields, search.keywords);
   } else if (isFieldType(type, "number")) {
     if (!field.includes(".")) {
-      return handleField(handler, handler.number, field, fields, search.keywords);
+      return handleField(handler, handler.number, field, fields, search.keywords, {
+        collectionName: collection.name
+      });
     }
   } else if (isFieldType(type, "date")) {
     if (!field.includes(".")) {
       const dateStr = handler.getFormateDateStr(field, fields);
       return handleField(handler, handler.date, field, fields, search.keywords, {
         timezone,
-        dateStr
+        dateStr,
+        collectionName: collection.name
       });
     }
   } else if (isFieldType(type, "json")) {

package/dist/server/types.d.ts

@@ -16,6 +16,7 @@ export interface ProcessFieldParams {
     timezone: string;
 }
 export type handleFieldParams = {
+    collectionName?: string;
     field: string;
     keyword: string;
     fields: Map<string, any>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tachybase/plugin-full-text-search",
-  "version": "0.23.48",
+  "version": "1.0.6",
   "description": "Provides full text search capability",
   "main": "dist/server/index.js",
   "devDependencies": {
@@ -10,11 +10,11 @@
     "sequelize": "^6.37.5"
   },
   "peerDependencies": {
-    "@tachybase/actions": "0.23.48",
-    "@tachybase/client": "0.23.48",
-    "@tachybase/database": "0.23.48",
-    "@tachybase/server": "0.23.48",
-    "@tachybase/test": "0.23.48"
+    "@tachybase/actions": "1.0.6",
+    "@tachybase/client": "1.0.6",
+    "@tachybase/database": "1.0.6",
+    "@tachybase/server": "1.0.6",
+    "@tachybase/test": "1.0.6"
   },
   "description.zh-CN": "提供全字段搜索能力",
   "displayName.zh-CN": "全文搜索"