@gct-paas/render 6.0.0-dev.9 → 6.0.3-dev.1

package/es/utils/search/listhook.mjs

@@ -87,5 +87,16 @@ var getQuerySort = ({ collation, collationSort, collationField }) => {
 		sortType: collationSort
 	}] : [];
 };
+/**
+* 关键字搜索时，取配置的搜索字段的第一段作为 similarField 交给后端做匹配度排序
+* 使用方：下拉/对象选择的关键字搜索、搜索选择组件（select-search）
+* 注意：与「查询组件」的 similarField（取第一个有值字段）来源不同，勿混用
+* @param searchField 配置的搜索字段
+* @param keyword 搜索的关键字
+*/
+function getSimilarFieldBySearchField(searchField, keyword) {
+	if (!keyword?.trim() || !searchField?.length) return void 0;
+	return searchField[0]?.split(".")[0] || void 0;
+}
 //#endregion
-export { getIExp, getIKeywordFieldKeys, getQueryDateByKeyWord, getQuerySort, useQueryfilter };
+export { getIExp, getIKeywordFieldKeys, getQueryDateByKeyWord, getQuerySort, getSimilarFieldBySearchField, useQueryfilter };

package/es/utils/search/search-default-value.mjs

@@ -199,6 +199,7 @@ function date_and_date_time(widget, _format, _params = {}) {
 		switch (defaultValueType) {
 			case DefaultDateTypeConst.SystemDate: return isRang ? [now.format(fs), now.format(fe)] : now.format(fs);
 			case DefaultDateTypeConst.PastDays: return [now.subtract(num, "day").format(fs), now.subtract(num > 0 ? 1 : 0, "day").format(fe)];
+			case DefaultDateTypeConst.FutureDays: return [now.add(num > 0 ? 1 : 0, "day").format(fs), now.add(num, "day").format(fe)];
 			case DefaultDateTypeConst.PastWeeks: return [now.subtract(num, "week").startOf("isoWeek").format(fs), now.subtract(num > 0 ? 1 : 0, "week").endOf("isoWeek").format(fe)];
 			case DefaultDateTypeConst.PastMonths: return [now.subtract(num, "month").startOf("month").format(fs), now.subtract(num > 0 ? 1 : 0, "month").endOf("month").format(fe)];
 			case DefaultDateTypeConst.PastYears: return [now.subtract(num, "year").startOf("year").format(fs), now.subtract(num > 0 ? 1 : 0, "year").endOf("year").format(fe)];

package/es/utils/search/search-hooks.d.ts

@@ -3,4 +3,5 @@ import { ISearchSchema } from '@gct-paas/schema';
 export declare function useGetBodyBySearch(formState: IObject, cacheColumns: ISearchSchema[], expStr?: string): {
     query: IObject;
     exp: string;
+    similarField: string | undefined;
 };

package/es/utils/search/search-hooks.mjs

@@ -22,20 +22,26 @@ function useGetBodyBySearch(formState, cacheColumns, expStr) {
 	function transformToBody(state) {
 		const body = {};
 		let exp = expStr || "";
+		/** 按查询组件顺序取第一个有值字段，供后端 similarField（搜索时按匹配度排序） */
+		let similarField;
 		cacheColumns.forEach((i) => {
 			const field = i.props.fieldSearchKey || i.props.field;
 			const ope = i.props.ope || [];
 			let value = state[i.id];
-			if (!isEmptySearchValue(value) || i.props.useMore) ope.forEach((o) => {
-				value = getMultipleChoiceToArray(value, o);
-				const key = `${field}.${o}:${i.id}`, expkey = `${i.id}.${o}`;
-				body[key] = i.props.useMore ? null : value;
-				exp = exp.replace(expkey, key);
-			});
+			if (!isEmptySearchValue(value) || i.props.useMore) {
+				if (!similarField && field) similarField = field;
+				ope.forEach((o) => {
+					value = getMultipleChoiceToArray(value, o);
+					const key = `${field}.${o}:${i.id}`, expkey = `${i.id}.${o}`;
+					body[key] = i.props.useMore ? null : value;
+					exp = exp.replace(expkey, key);
+				});
+			}
 		});
 		return {
 			body,
-			exp
+			exp,
+			similarField
 		};
 	}
 	/** rdo版本关联查询数据单独处理 */
@@ -59,10 +65,11 @@ function useGetBodyBySearch(formState, cacheColumns, expStr) {
 		});
 		return state;
 	}
-	const { body, exp } = transformToBody(transformRdo(formState, cacheColumns));
+	const { body, exp, similarField } = transformToBody(transformRdo(formState, cacheColumns));
 	return {
 		query: body,
-		exp
+		exp,
+		similarField
 	};
 }
 function getMultipleChoiceToArray(value, ope) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/render",
-  "version": "6.0.0-dev.9",
+  "version": "6.0.3-dev.1",
   "type": "module",
   "description": "paas 平台网页端底包",
   "loader": "dist/loader.esm.min.js",
@@ -31,7 +31,7 @@
   "license": "MIT",
   "author": "gct",
   "dependencies": {
-    "@gct-paas/api": "^6.0.0-dev.7",
+    "@gct-paas/api": "^6.0.0-dev.17",
     "@vueuse/core": "^14.1.0",
     "axios": "^1.13.2",
     "bignumber.js": "^10.0.2",
@@ -44,10 +44,10 @@
     "qx-util": "^0.4.8",
     "vue": "^3.5.30",
     "vue3-dnd": "^2.1.0",
-    "@gct-paas/core": "6.0.0-dev.9",
-    "@gct-paas/core-web": "6.0.0-dev.9",
-    "@gct-paas/scss": "6.0.0-dev.9",
-    "@gct-paas/schema": "6.0.0-dev.9"
+    "@gct-paas/core": "6.0.3-dev.1",
+    "@gct-paas/core-web": "6.0.3-dev.1",
+    "@gct-paas/scss": "6.0.3-dev.1",
+    "@gct-paas/schema": "6.0.3-dev.1"
   },
   "devDependencies": {
     "@types/escodegen": "^0.0.10",
@@ -55,12 +55,12 @@
     "@types/estree": "^1.0.8"
   },
   "peerDependencies": {
-    "@gct-paas/api": "^6.0.0-dev.7",
+    "@gct-paas/api": "^6.0.0-dev.17",
     "vue": ">=3",
-    "@gct-paas/core": "6.0.0-dev.9",
-    "@gct-paas/core-web": "6.0.0-dev.9",
-    "@gct-paas/schema": "6.0.0-dev.9",
-    "@gct-paas/scss": "6.0.0-dev.9"
+    "@gct-paas/core-web": "6.0.3-dev.1",
+    "@gct-paas/scss": "6.0.3-dev.1",
+    "@gct-paas/core": "6.0.3-dev.1",
+    "@gct-paas/schema": "6.0.3-dev.1"
   },
   "scripts": {
     "dev": "cross-env NODE_ENV=development vite build --watch --config vite.dev.config.ts",